If the build number's the same, then yes, but I could have sworn T-Mobile UK has all their Hero phones on 1.6. I mean the G1 on T-Mobile UK is, and it's a less powerful phone.
The Hero only started getting 2.1 recently. So yes, you may need to wait a while. But I suspect T-Mobile UK will never...