I'm in the same boat but will wait and see what comes down the line. I got two E4GT phones for my kids and they are incredible. They lay waste to my EVO. Samsung really stepped up their game. I don't know if HTC will be able to compete from here on out since Sammy has fully commited to Android. I've used the Gnex and don't like it as much as the GSII. I really want a phone that has built in image stabilization for video. Other than that the GSII camera kills! Way better than my little Canon P/S.
I don't think I will be upgrading next month when my time comes. There is really nothing out IMHO that can still compete with the OG EVO. Meaning the custom roms, tweeks, etc that you can do to the phone. HTC makes a good solid phone and I would definetly have to stay with a HTC line
XDA Developers was founded by developers, for developers. It is now a valuable resource for people who want to make the most of their mobile devices, from customizing the look and feel to adding new functionality. Are you a developer?