Yeah my resolution was about the same. They can't (read won't) do anything. I've downgraded to 1.5 again using the RUU on HTC's web site. So disappointed but not much I can do.
I'd love to get a Desire - apparently they work with COMAND - they run 2.1 natively (and have just updated to 2.2) so I don't understand why the Hero won't work.