I have a long history with iPhones. I started with a 4GB 2G, upgraded to a 3G, and then sold the 3G to save a few bucks on data. I couldn't stand my iPhone-less life, so I picked up a 3GS two weeks ago at the subsidized AT&T price (16gb $199). I'm loving the 3GS and find it a worthy upgrade over the 3G. However, I definitely have some level of buyer's remorse after reading about the (potential) upgrades of the 4G/HD. I have two more weeks left to return the 3GS and pay a 10% restock fee. Any other recent purchasers contemplating the same decision?