I think it would be a mistake to buy a high end phone right now, even on other carriers, let alone on TMO.
IMO, 2.4 will kick off the dual core smart phone mania. Just speculating here, I would describe the next ~2 months as silence before the storm when the big launches start rolling out.
Android ports for my HD2 have gotten really good, no need to rush...