I was re-reading the Manga and I noticed something interesting. The moment before Neji dies if you read closely to the parts where Neji and Hinata are defending Naruto while talking to him, Neji says " Me and Hinata are going to risk our lives for you, Naruto-kun"!
...Now once he dies Naruto has the flashback of what he said about Hinata and him, which may have gave him a thought of Hinata and Neji protecting him, since that is what their clan is about. So I theorized that maybe Hinata will die, JUST MAYBE she will die, im not very sure because there are other fields where it may classify for her to stay and watch Naruto become Hokage.
So either Kishimoto wants to go along with the flashback he drew Naruto with so Hinata will die during the Juubi fight, or he goes with the facts we all are sure of that he saves Hinatas day, r she is normally alive.