got an iPhone 3G S about 20 days ago. That means I can return it no problem for the next 10 days. Should I return it, wait about 6 weeks, and get the iPhone 4.0 instead? I also put about $25 towards accessories but I could probably sell them for $15. Is it worth it not having it for those 6 weeks? Or should I just go with the free update, keep my screen protectors and case, and "survive" without the phone.

What new features will come with the phone? My understanding is that most of the features will be part of the upgrade.

My other option will probably be to give it back and then when they make the official announcement, buy the 3G S for maybe $99 if they drop the price that much.