I've got a Touch but, since O2 adjusted their tariffs, the iPhone has come into my price range and I am seriously considering getting one. But should I wait? Sod's law says a week after it arrives Apple will announce the new model. Does anyone have any idea what Apple's plans are? If I'm stuck with the same one for 18months, I don't want to chance having the 'old one' if possible.