I currently have an EVO 3d and love Android.
I did however order a 4s because of ios5. While still behind in terms of screen size and resolution the rest of its hardware has indeed caught up with the Android phones. Back when the iPhone first came out I really wanted one due to the novelty and i love all gadgets and technology, even Apple products, but I'm definitely a pc.
When Android came along I jumped onboard and haven't looked back.
Did apple revolutionize anything with the 4s, no. However they have mostly caught up with android features I use and like and then took a bunch of stuff Android's been able to do for a while, through 3rd party apps, and rolled it into ios5, made pretty and fairly easy to use.
The things that intrigued me most were siri, friend-locater and iCloud. If I can get past the remaining operational differences between iOS and Android I'll use both my EVO 3d and the 4s. Thanks to Google voice I won't have to carry both at one if i don't want to.