Why wait? I would suggest the HTC 1.. Its still an android but at least its a nice looking phone.
Apple is never going to satisfy you. They don't release half ass gimmicky features. They generally will not implement something until A) they don't feel its just a gimmick (they have still made a few bad calls) and B) they can implement a feature without negatively impacting the performance, stability, or battery life of the device... That is why older devices don't always get new features...
I think that the 5S might finally be powerful and efficient enough to implement a few new things such as quick reply and maybe some sort of widget / live icon without effecting the device much... But don't expect to be getting any unannounced features on your current device..
Apple doesn't work that way.. But the good news for you is that android manufactures do.. The devices are almost in a perpetual state of beta.. They will implement any feature that sounds cool without as much regard for how it effects the performance or how polished and consistent the usability is.
There is always the IOS jailbreak community.. But I some how doubt that you have The patience to wait for a jailbreak every time the OS is updated...
So why wait? Go to your favorite shop and pick up an HTC 1.. Its a sexy phone and has the huge jumble of this and that that you are looking for