I'd say the S. Just not sure if the jump from a boxster S to a 997 non S is worth it.

I had a 997S launch car and loved it. In fact it was the only car that I regretted selling. When I got the S, I had previously driven the non S. I liked it less and could afford the S, so it was an easy decision.