If I were you I'd wait a bit to see what the next Nexus offers, and/or for Google's version of Maps which is sure to come out on iOS soon-ish (though lacking the level of integration Apple Maps provides).
I'm kinda debating inside my head seeing what the Nokia Lumia 920 looks like - comes out about a month from now. Basically, I've grown to really dislike small petty and insignificant stuff on Android (e.g. icon sizes), so if there's a change with something that does the job properly, I'm game for it.
