Naruto accomplished all the goals he set for himself as a kid. Sasuke deviated heavily from his path and had to be brought back to the light, so I'd say Naruto did better by his past self, though Sasuke did manage to come back to the good side.
I think it was naruto. Because he showed his younger self that they had accomplished their dreams and that the village now respected them and that they had a happy life and family to look forward to seeing. 😋😭