OK, so I've got a version 1 iPhone that I love. I'll probably buy a 3G 16GB model this weekend (if anyone has any left; have to work on Friday). But, since I have to renew my AT&T contract for another 2 years, and since the price of the phone is subsidized like other AT&T phones, will I have to wait until AT&T "allows" me to upgrade my hardware before I could buy a (presumably eventually forthcoming) 32GB iPhone? Will I have to pay $599 like other AT&T customers do who aren't yet eligible for phone upgrades? Anyone know how this is going to work?