What episode Sasuke becomes good?

Episode 477, after his last hot blooded battle against his eternal rival Uzumaki Naruto.

Does Sasuke join Team 7 again?

3 Tried To Kill Sakura After the time-skip, team 7 was reunited once again. During this reunion, Naruto, Kakashi and Sakura admitted to bringing Sasuke back to the village.