I would certainly go with the TDi. Ditto the torque comments, but you can also put in larger injectors and reprogram the ECU for GOBS AND GOBS more torque, you'd have to check the TDi forums, but I think the thing could be ALMOST quick. And still get 50whatever MPG when your foot isn't in it.