So I think that some divine intervention has been involved in the iPhone 3G I got a couple of weeks ago. A couple of days after I bought the phone, AT&T started selling limited data plans, so I was one of the last people to get an unlimited data plan for $30/month.
I also bought it 29 days before the iPhone 4 is being released, which means I will still be within the 30 day return policy once the iPhone 4 is released. I just got off the phone with the AT&T store, and I can go in on June 15 and reserve the iPhone 4, pick it up on June 24 (release date), and return my iPhone 3G for a refund, transfer all my info/data, and keep my current phone number. I'm SOOO excited! I've never ever ever been one of the first people to have something "new and cutting edge," so I can't wait!!
Re: Already upgrading my iPhone...
Oh I'll definitely get a case. I have one on my current phone, but since it's from the Apple store, I can exchange it for one that will fit the iPhone 4. Everything I've read says the glass makes the phone stronger, more durable, and more scratch-resistant than the plastic on the current phones.... that just doesn't make sense to me haha.