Please help me decide - tp2 or htc hero

[1100101]

Also thinking about TP2 vs Hero and I was set on getting the Hero just because of a change in platform and size and cool factor. From what I have seen the Hero has had some really good reviews and I feel that I can adapt to the on-screen keyboard (currently have the HTC 6800).
I was even in the Best Buy store ready to purchase the Hero, and walkng through the registration. Come to find out I was being forced to upgrade my Sprint family to more than double what I was paying now. I called Sprint and discovered that the TP2 does not require that I upgrade, so this may be the deal breaker for me.
I really love the screen size and keyboard on the TP2, but am very interested in Android's future. However, there is really great support for Windows and even if the ship is sinking, it will take awhile. Plus I am trying to be optimistic with WMO 7...some day.
So for me, it's going to be based on plan seems like. I really don't see how you could go wrong with either phone, both are very impressive.