WP7 is going to crush Android when Nokia launches its wave of phones. As soon as that stabilizes, the other OEMs are going to prefer WP7.
This is because with Android, HTC and Samsung currently have to pay a fee to Microsoft anyway, for every phone sold. I'm sure that is annoying.
Either of those is not a deal breaker. If I want to watch a movie, I do it on a beautiful big screen TV, if I want to play the latest game, I play it on my PC. However, nice additions would be 1080p/12MP camera with nice optics, Super AMOLED screen and the ability to avoid using Zune for things like exchange files with PC, using SD card, etc.