Well the problem with those options is I have made a considerable investment in iTunes and App store purchases.
I was never a fan of Apple products before, still not when it comes to mac's, horribly overpiced for what they are.
But 2 years ago I was torn between iPhone 3GS, Google Nexus one, or the original HTC Desire. I went with the iPhone, and I don't regret it, but it does mean if I change to Android now, I'll loose all the apps, music, TV eps, movies etc etc, I've even started using iCloud now, so yeh, I'd like to stay with Apple. For my mobile anyway.

Thanks for the suggestions, but I'm still debating the same issue. Do I take a 4S now, or how long will I have to wait for the next model?
Bear in mind too, that as you guys said, the competition, especially Samsung, have upped the game considerably. How will Apple respond?