I'm coming up on 3 years of use for my T-Mobile Blackberry Curve 8320 w/ UMA support. Still waiting for an all-around better device and network setup for my us

I'm coming up on 3 years of use for my T-Mobile Blackberry Curve 8320 w/ UMA support. Still waiting for an all-around better device and network setup for my usage pattern (messaging/emailing a lot, talking a lot, maps, occasional web browsing). While the T-Mobile coverage has sucked plenty in certain areas, I've had nearly 3 years of satisfaction that if there's a wifi network, I have coverage -- in various apartments where coverage sucked, deep inside work buildings (where other service providers also can't penetrate), at other people's houses where there isn't great coverage... and it costs me nothing. Unlimited calls/data/messaging w/ UMA included: ~$90/month. Plus I can tether! Anyone know if T-Mo is baking UMA support into any upcoming Android devices?