Own a Samsung Vibrant, need something new

I've been unfortunate enough to have a Samsung Vibrant since launch day with all the fixins' such as non-functional GPS, daily freezing, bluetooth strokes, terrible battery life, and more!

This is BY FAR the worst phone I have ever owned.

I like T-Mobile but the only thing keeping me here is their prices.  Verizon's handsets are vastly superior to what T-mo is currently offering.  I could never do another Samsung phone after this disaster which significantly reduces my choices.  Also, I don't want a stupid genius button.  So I'm left with about two phones, neither of which excite me.

Exciting phones to me are the HTC Rezound, Droid Razr and the likes.

So does T-Mobile have anything in the pipeline that will be even remotely exciting/interesting?  Or should I just head to VZW?

Tmo's GS2 is wayy better than GS1. Better screen and GPS works perfectly, and TW4 is wayy better than TW3. Other than that check out Amaze 4G, or wait for the next phones coming out soon like the HTC Ville with Android 4.0 (ICS), or the Samsung Galaxy S Blaze 4G (hopefully its a good phone).