I don't see why people are so bent out of shape, the only evidence that Kishi gave us of a last Naruto Vs Sasuke was in an interview either last year or at the start of Part 2 (from what I remember when people first asked if they are actually going to fight again like near the end of part 1).
Writers change their minds and it seems like since he decided to turn Sasuke "good" with a mutual goal all people care about is a fight still and not the huge character development. Kishi's work is trying to show us a moral and always has been. If you haven't figured that out yet... then you may never will understand the manga.
To add on. Sasuke never did agree to STAY in the village, nor was it laid down flat that he was good either. He said he would help aid the 4 Hokage and the alliance, that's all.
"I will not let Itachi's will or the village go to waste" By saying that he means literally go to waste, leveled.. by the current war. Which has half happened. Itachi's will was to protect the Leaf in the best way he could. Sasuke is an international criminal, which means after the war and if Tsunade lives, she will want him brought in and sentenced.. knowing how Kishi writes, I'm sure his sentence will be to be bound to the village in a permanent debt to it (like probation). There will be some kind of agreement and I'm sure Sasuke's argument for Naruto is what I stated about him being a criminal, at that point Naruto will say something like "Then let me test if you really are one, you let me live when we were kids. Lets see if you still have any bonds." And from there will be their final "fight" thing.
(sorry for the rambles)