frankly, I feel that I'm in a great position. I bought the droid x a few months after it hit. I'm on a 2 year, and to be honest, I don't really think this line up phones is any better then mine right now. I compare this to the iphone 3G when it upgraded to 3Gs. It's not a big deal.
The dual chip is the only thing I like. But I've got blur completely removed and my phone flies anyway. My batter life is around 30 hours of average use. I really can't complain. I honestly think, unless you have the money, it wouldn't be the worst thing in the world to wait for the NEXT line up of phones, as those will all have the better chips, front facing cameras and bigger batteries (when will htc start caring about battery life?).
Then again, some people will go and buy a phone every year. My point is, your device is still very relevant. I don't think you'll really notice a huge difference no matter what you do.
My buddy got an iphone 4 after having the iphone OG, and it was like he upgraded from dumbphone to smartphone all over again. that's what an upgrade should be. I'm waiting, and I'm rocking my newly rooted liberty droid x and it's FLY, and still in the top 4 android phones on the market, even after the new line up is released.