I actually do agree with you on this. I only see WP7 really taking off after the introduction of Windows 8, when MS can really sell the idea of a unified UX. That's where you're going to see a lot of mass adoption coming from.