Become a MacRumors Supporter for $50/year with no ads, ability to filter front page stories, and private forums.
Well since you already have a 3G, I don't think you're missing much by going to the 3GS. I would wait it out. If you don't have an iPhone, then that's a different story.
 
Register on MacRumors! This sidebar will go away, and you'll see fewer ads.