IMHO, go for the Boxster S. It's much more than just an engine upgrade. Brakes, suspension, gearbox, heck even the gauges are different. And you can find relatively low-mileage examples for under $20k right now if you look hard enough.
Good luck with your decision.
