I just used the bottom end of the 1.8 because thats only what i bought but mine had been rebuilt.
Head wise gas flowing and polishing's what you need to have done when i had mine done i was told the valves are about right so theres no need to go for bigger ones