There has been a lot of talk of another time skip, so I came up with at theory that balances out all the issues.
After the war is over, we see several sub plots from throughout the series covered. Then we get a 20 or 30 year time skip. Naruto is now Hokage and he has brought peace to the world or something like that. We learn a great deal about what happened from conversations. But Sasuke mysteriously disapeared after the war, Sasuke has finally returned and is dead set on destroying the Hidden Leaf Villiage.
Naruto confronts Sasuke and they have it out. Naruto learns where Sasuke has been and why he has waited this long to attack and a great deal is resolved.
They fight each other and we get our conclusion.
I thought this prediction sort of deals with a lot of issues for example: Naruto pedicted that they would both die if they fight but Naruto also says he won't die until he became Hokage so this deals with that.
We also get to see Naruto and Sasuke in there primes and it mirrors the Madara and Hashi fight better. In the flashbacks Madara was depicted as young when he left the villiage and much older when he and Hashirama fought it out. (The flashbacks when Obito is telling Sasuke about Itachi).
If Naruto does end up dieing with Sasuke then we get a parallel to Minato dieing for the Viliage's sake.
So what do you think?
This was just a idea that popped into my head.