I'm in the same boat. I've been waiting and waiting for the "right" phone to come along and it just hasn't happened yet. I'm sure HOPING the Passion ends up being the one. However, if it's not, that HD2 sure looks sweet. The only reason I would even consider it is because of Windows 7 being on the horizon. My concern, though, is that Android is on the way up in terms of popularity so they'll be getting more support in terms of Developers and Apps and so forth, while Windows is a big question mark. I'm not one of those anti WinMo people just for sake of being anti WinMo. I'm willing to give it the benefit of the doubt, especially since I'm hearing that it's not so bad on the HD2 with the HTC UI on top of it. And considering 7 SHOULD be a vast improvement. The hardware is just too sweet lookin to pass up. Although I'm not sure if the screen will be too big for me or not.
So...for me, my last hopes are the Passion or the HD2 and if those don't do it MAYBE going for the Droid. I'm not gonna freakin wait forever for the Xperia or the Acer. So, as far as what you SHOULD get, I don't think you can make that decision until the Passion and HD2 hit the streets and you can get your hands on them to get a feel for them. I do suggest holding out for them, though, instead of jumping to the droid just yet.