A 2.0 ltr swap makes sense. No point doing the cams when the standard ones are good for 170 bhp. It is the inlet and mapping that hold the power back.