For all that I rag on this phone, it's light years better than my old Touch Pro. Though I've never owned a TP2, I've used one extensively and all the pretty HTC skin in the world can't completely hide the old gnarly wart that is winmo. As for BB's? I don't get it at all. The OS is old and crippled. Email and battery life are great, but the rest is suck.
2.1 does fix many of the issues with this phone, have you tried the leak? I came across
this battery guide and the one thing I hadn't tried before was changing the wifi sleep policy. While I haven't seen much of a noticeable effect on battery life yet, my cdma lockup issues after turning off wifi seem to have disappeared(so far). This phone isn't the most inspiring thing I've owned and I doubt I'll own it for more than a year, but it's not a total POS either. I certainly would reserve judgment till the official 2.1 release. Anyway, if you just can't live in the Moment, I wish you well with your TP2 or Tour.