My old CVH XR2i used to wipe the floor with RS1800's so don't be too hasty to dismiss the old motor.
Saying that for the track I would be inclined to fit a 2.0 Mondeo engine and run it on bike carbs. The engines are cheap and plentifull and give nice power