Personal decision really, but if you want the "S" I would bail now before there's more depreciation on your current Boxster. But keep in mind those "gremlins" are pretty standard throughout. You have to determine the willingness to pony up when some thing needs to be replaced. I've heard many times there's nothing more expensive then an old Porsche, but I'm willing to keep owning one.