One of the things that upset me is that Kishi ended like SS doujin.
I think that may have been the point, if what myself and many others have said is true with thinking that the ending was changed at some point this year then it makes sense that it would get changed to SS it is the most popular hetero pairing in both Japan and in the west so at least some parts of the new ending were changed to reflect positively on SS that being 699.
NH seems like an afterthought because I think it was an afterthought if Naruto wasn't going to get Sakura then that really only leaves Hinata so in the interest of not having Naruto being alone it got pasted into the epilogue and any development they needed was pushed to the movie as a way to explain it.