Then your better off with the 1.8 I think. The 2.0 engine really doesn't give you the power or torque you need. Not for the weight gain.
At least thats the impression I get from researching my engine upgrade. Looking at upping my 2.5 to the 2.8. It's a relativly simple operation with many stock bits from the engine range. Plus as mines a cabby, I don't want to be giving it too many beans at high revs. They have a tendancy to twist. Not something you want at speed.
The 2.0l engine is a donor for the 2.8 strokeing of the 2.5, so even if you don't use it for racing, you can always use it for that.