Apple probably won't change it, they got this whole 2 year plan going.
Oh iPhone 2g, you might have lacked 3G, but you were built like a rock.
They honestly need to get away from glass though. As a person who used to carry his phone naked, I learned the hard way last night that I should of had a case. I actually cut myself on cut glass from the screen (it was in my pocket, placed the hand in, SURPRISE!).
They could keep the current form, but have 1 antennae wrap around, and one inside to avoid all interference. That or make the screen bigger and stick the antennae back inside. Maybe create smaller better batteries.