I actually like HTC phones. The G1 was the beginning of the movement. The Nexus 1 was the first beast Android device followed by their Dinc which was basically the same with a better camera. The Incredible and Evo lines are all top quality phones in my opinion. I never had battery issues with my Dinc. I think the Vigor is going to be an awesome phone and I think it'd be a smack in HTC's face to brand the Charge a Droid and not the Vigor. HTC needs a 4G phone in the Droid lineup.
I could care less about the Droid branding really, as it doesn't prove anything about how good the phone is... but I think the Vigor will be worthy.