I think that the battle between Naruto and Sasuke could be in the next Chuunin exam after the war. 
If Sasuke comes back to the village, he still will be a Genin, and Naruto is a Genin too. So they might participate in the Chuunin exam, and obviously fight each other. And it would be an all-out fight because non of them would want to lose. What do you think, ay?

If Sasuke comes back to the village, he still will be a Genin, and Naruto is a Genin too. So they might participate in the Chuunin exam, and obviously fight each other. And it would be an all-out fight because non of them would want to lose. What do you think, ay?