Im in the same boat as the OP. My love for wm goes as far back as the 6600 (w/camera), 6700, Vogue and now, the Touch Pro (Mighty ROM6). I plan on skipping the Touch Pro2 until a wm7 device.
I know Snapdragon and Tegra (outperforms snapdragon) look amazing, to me wm7 got me alittle worried. From the pictures I've seen, it looks like a glorified wm6.xx. Same old taskbar and bottombar w/a new twist. I'm wishing that they revamp wm7 like they did w/the Zune HD
http://www.youtube.com/watch?v=0_WPdg6zUeE The Zune HD OS is awesome (I ever use that word).
For meantime, I'm out of contract w/Sprint. I plan on buying the HTC Hero when it comes to Sprint or even get a Palm Pre on ebay to hold me over. Lets hope wm7 can bring the most of us back to windows mobile.