I believe that Sasuke truly had a change of heart because he was finally able to realize what Itachi was fighting for and he finally realized that the leaf village actually does not hate the Uchiha's after all, or at least not all of them including the higher ups. Sasuke will not go back to the leaf village after the war is over. In Sasuke's eyes he does not have anything left in the ninja world to live for. Sasuke's entire clan has been destroyed and his family is all dead the only thing he ever cared about is gone, therefore he will still fight Naruto and chose to die only by Naruto's hands in order to end his pain and suffering and finally join his clan and family members in peace.