Seaching for my perfect android

It is a while that I'm following android waiting for a device that is right for me.
I've had the change to play with the European hero, and the magic, and I have to admit that sense surprised me a lot, especially the SW keyboard.

But the SW keyboard is good for chat, sms and so on but it is almost useless when you need to work in ssh on any other command line based enviroment, and I have to be able to do that in emergency situations.
So I really need is a good HW keyboard, the milestone one seems terrible (and I read that indeed it is), and as I said I like Sense .
Actually I think that the right phone for me would be like an "HTC Touch Pro2" with Android 2.0+ and sense, But I don't want to have that with hacks, I want a fully supported phone.
Do you think that there is any hope?
Cya

 

Is not much a issue of carrier, in italy both the hero and the milestone (gsm droid) are sold unlocked (and you pay for that 450

 

It seems (rumors) that htc will make an hero with a keyboard codename: Espresso.
This could be the one for me
At least I hope
Cya