Sorry to see you had such a gas bag experience with the loyalty department. That's why one of my good friends switched to AT&T last year. They really are selling older stuff these days. Still, depending what Nokia announces, you might get something decent, especially on a special. I think the Lumia 620 may come to T-Mo, if you like smaller handsets, and perhaps T-Mo will get their version of the 920. I liked those old Androids you're trying to punt back in the days, especially the G2. Perhaps hanging tight is best for you.
Have you played with the 810 in the store though? I do love mine.
I have played with the 810 and really like it. I love my G2, but its time has passed. Also, both it and my wife's phone will no longer receive any updates ever. This is why I find it odd that TMo is still hocking them. Coming out the door they are out of date and insecure. This is my beef with Android in general. I know that I can load a custom rom (which is really a cool thing!), but I really don't feel like I should have to, ya know? To me, it seems unseemly to sell devices that are a top target of malware without at least applying basic security fixes. Most users don't want to, don't know how to, or just don't know that they can, -and in cases like mine- , don't know that they should flash them to something a bit more secure.
The G2, for example, had Flash loaded by default. There was no way to remove it unless you flash the whole thing. The last update for Flash came in June of last year. Lameness.
I played with WP8 on both the 8x and the 810 a lot in the stores and really liked them both. The flexibility of the 810 won me over, however. Not to mention it being a Nokia device. I got time, but I am also eager to replace these devices with something else.