I don't think the hassle factor is a problem in Vietnam these days. And five days soaking up the atmosphere and eating (and then eating some more) in Hanoi isn't too much.
Agreed. I much prefer HCMC over Hanoi though.
I don't think you will find a "blockbuster" type of thing in Vietnam though, especially if you didn't have the best time in Northern Thailand.