Going back to WinMo from Android (Samsung Moment) TP or TP2?

[SNYPE2K9]

After 6 months with a Samsung Moment, I am still unhappy with it. I upgraded because I accidentally scratched up my screen with my keys. I have rooted my Moment and kept current on the scene but I'm just not seeing what I want to see from it. Hardware 3D and multi-touch are in the works, but at the same time I don't think that will save it in my eyes. My headphone port is also starting to go which is very discouraging as well. I of course came back to WinMo because I know WinMo and love WinMo and I see my old device handling Android just as well as my Moment. Now I'm thinking I'm coming back and I'm trying to decide, Touch Pro or Touch Pro 2. I thought about asking this in the Touch Pro forum but then I realized I want to know why YOU upgraded. Is there anything you found truly worthwhile or groundbreaking that made you upgrade? Keep in mind this is kind of a slight battle for you as I think I will miss the flash...it made a good flashlight and I'm afraid of the dark lol. Though I am also a gamer so feel free to get to me that way XD

EDIT: Also, if anyone would like to trade for my Moment, I'd be glad to trade. Just keep in mind the headphone port is going and there is some slight wear.

Oh and current ebay prices for Touch Pro ($100) and Touch Pro 2 ($200). Is it worth the jump in price?