I'd be dubious going from one phone where you're waiting for an upgrade to another phone (x10) where you'll be waiting for an upgrade..
And there'll never be an upgrade for the HD2
your best bet is getting something very close to the Nexus, since this will most likely be the reference platform.. I'd either go with this, or as mentioned previously a desire.. not that personaly i'm ready to sell my soul to google..