I agree with Pussy. If it's an Auto, junk it & put in a Manual.
Since you're preparing for a bigger wallet. Sounds like money is a significant consideration. In my opinion, I'd go for a supercharger c/w intercooler. It'll give both more hp & torque (also in a more linear way than a turbo). Yet, when you're in the traffic jam, it'll drink no more than your current 2.5l. :top:
If you go for a 3.2L option, be prepared for a 3.2 petrol appetite. :2: