Wait a while.
Mark 2 of the iPhone will be a lot better (Copy, Paste etc. Apple??).
It will also be released unlocked, as people are complaining about O2's monopoly.
In Germany, Apple have been forced to sell unlocked iPhones!!!
The software will be updated anyway - Apple could not afford not to
Not too fussed about the locked aspect
The only thing a new i phone might have is 3G but unless you stream audio/video - and I dont - its not an issue
And - this site loads a lot better under iphone than orange 3G!