Here's an idea to fixing the issues with the Rescue arc.
>Naruto learns that Sasuke left Konoha to go to Orochimaru.
>Naruto promises Sakura to bring him back.
>Naruto goes immediately to find Sasuke SOLO
>Naruto catches up and confronts Sasuke.
>Vote happens as in the og.