I`m building a MK1 Golf stage rally car and trying to decide what would be my best options.

I don`t want anything turbo and below a 2.0 due to the class entered.I want to keep the fuel injection.
What i`ve considered,
1.8 bottom end with 8v or 16v head.
2.0 bottom end with 8v or 16v head.
Do i keep to K-Jet injection or fit a later MK2 Digifant injection if i keep the 8v.
Or do i go for a Mk3 2.0 8v or 16v(if these are fitable) - which would not have a cat fitted.
Wiring and mods needed to fit any of these isn`t to much of a problem.
What is a good gearbox to go for?This car will be getting some stick and i need something strong.
The rest of the car i have pretty well sorted at the moment but if i get stuck i`ll ask.
Any advice/help will be appreciated
