Agree, should at least overnight in Ha Long bay on the boat but no more than 2 nights.
Probably can get by with 1 full day in Hanoi.
I would strongly consider adding Da Nang/Hoi An since you are already in Vietnam. I would choose more days in Hoi An over Hanoi, loved it!