Just letting you know, the finale is coming close and the final battle just finished. I'm holding my breath for the ships though (and I let you guys know, if it plays out, many of you may not like it).
The Hinata heartbroken bit, that can be solved easily: have Naruto being honest with her in a private conversation, he is not interested in her romantically. It can benefit her to move on and find someone to be with her. She was never important in the first place. It was her fans (and some inside help) that were pushing her which resulted on how the franchise ended up now.