TP2 or wait?

[MrCapcom]

Right now I have a Samsung Omnia. And its the best phone I have had. I went from Moto Razr to LG Env to LG Dare and now the Samsung Omnia. I was thinking of getting the TP2 for Verizon for something a bit more zippy and well HTC devices seem to have a bit more support as far as apps etc being developed. I love my omnia and it was my first windows mobile phone, so im looking forward to the TP2 but I can't help but think maybe I should wait to see if the HD2 comes out on Verizon or if there is any other phones with keyboards I should try. Leaving Verizon is out of the question, but for now I really want a TP2 but its like should I wait? I'm pretty sure it won't support windows 7 mobile. I just figured I would make a topic see if you guys/gals could help me with deciding on which phone to get. Thanks