You can have my One X then.
I can't wait to get rid of it, and go back to iOS. I'm sick and tired of poor quality, hideous apps. And I'm sick of not knowing when my next software update is coming. Jelly Bean has been out for months, but I have no idea when my One X will get it. Compare that to my original 3GS from 2009 that will get iOS 6 the day it's released.
If you are going to go to Android then the Nexus phones are the
ONLY Android phones even worth considering. They aren't bogged down by obtrusive UI skins (Sense, Touchwiz) and you'll get the latest OS pretty much when it comes out.
There's nothing radically different they can really do with the iPhone. Apple design is really about taking away any excess until they have the simplest, most intuitive device available. They pretty much accomplished that with the iPhone 4. From here on out it will most likely be incremental improvements.