I'd pay iPhix a visit in Eau Claire if Apple can't help you(
http://iphix.ca/) and hold out. That being said the jump from 3GS to 4S is quite significant. I'm happy I made the switch, but if you are willing to wait it out until next year you clearly aren't the same type of geek as I.