You have gotten your car sorted and know the history. Thats a big plus.
But if your not happy with it and want the S, I would get a early 05 Boxster S with the sport chrono. No TPMS sensor to worry about, different interior layout and ALSO the sport button which tightens the suspension and increases the throttle response. When the tech told me about the throttle response, I was confused because that's what my foot does right? Well after I tried t out it was kind of like this.....
Men in Black - Tunnel Scene - YouTube
Its two cars in one.