I rather something happens to make them not fight in the manga, like Sasuke start to feel side effects from using his Rinnegan then he and Naruto agree to put off the fight in a few years when both of them can fully master their power. Then the Last takes place in that time skip where Naruto and Sasuke face off.
Naruto would not only train but work on changing the system with the Kages and feudal lords so when Sasuke meets Naruto he'll know what Naruto have done to change the system but he doesn't tell Naruto this. Naruto has grown more mature and agrees to fight with Sasuke to the death. At the end of the fight, Naruto stops right before dealing the death blow and tells Sasuke he won and that with his sensory ability he can sense the change in Sasuke from the last they met and know Sasuke doesn't have the same desire as he once had.
Sasuke will say Naruto is right but goes on to say how he entered this fight to settle who was stronger at least since his ideals lost to Naruto but he wanted to see if his strength did as well. Sasuke would tell Naruto how the Uchihas were as Tobirama said they were, a clan cursed by hatred and if there were no more Uchihas then Naruto's way at least have a chance. Naruto would interject here and say their destiny isn't written in stone (he'll remember Neji at this point) and if Sasuke wants to change that about the Uchihas then he should do so as the last living Uchiha he can rebuild a new and better clan that doesn't have to make the same mistakes as the old one. To leave what the Uchiha clan was with the old system and to recreate the clan along with the new system.
Naruto would go on to say that Itachi still wanted the Uchihas name to not be tarnished and Sasuke can make the clan as his brother would have wanted and that his father would have been proud of. Sasuke stays silence and Naruto tells him he knows where the village is when he's done thinking things thru and leaves him to go back home. Naruto meets up with K11 at the gate who asked him what happens but Naruto smiles and asked them to ask him and motions towards Sasuke who is shown walking towards them in the distances.
Naruto later on gets elected as Hokage with Sasuke, Shikamaru, and Sai or Sakura as advisors. That would more be the mid-ending for all of this while the beginning if the movie introduce everyone after the time skip and maybe we'll see Naruto fight Gaara and/or Lee for old times since they were sort of rivals in part 1 (well Lee was one).
