I seriously wish Apple would not keep customers in the dark so much, then surprise them with a new piece of hardware on the fly. I understand they want to not lose months of possible sales from people waiting for a new device, but this is ridiculous.
Based on that one article where someone high up at AT&T spilled about possible new hardware upgrades, I'd be happier with the 3G as it is now and the 3.0 OS upgrade expected. I'm going to have to kill my T-Mobile contract either way (it ends in Oct and I need to switch sooner for personal reasons), so I'm not going to wait.
My only big hope are price reductions for AT&T service, but even with a contract I can change my plan if I see better ones come up later.
I wouldn't be surprised if a new iPhone comes out this summer. It could be the "wow" device people want, but most of the new functions I'm not interested in. It could also just be a RAM update, but I think 16GB will be fine for me since I'm keeping my older iPod anyway for music.
I personally would rather buy now, wait til the exclusivity contract ends, and you know Apple will lauch an even better iPhone when everyone can carry it, and then wait the 2nd year for all the bugs to be worked out before I update.