>>If you don't have a Mac, you should rule out iPhone for one simple reason. iTunes is just absolutely horrible on Windows.
>
>Yes, so far, it seems to target towards the Galaxy one.

You might wait a few days until the Galaxy Nexus is sold -
sports much higher screen resolution than the S2, slightly more scren area
and from day one runs under Andoid 4.