Since you know that Sasuke is going to use his mystery regardless what is the rest of the team doing, just remove Sasuke. Problem solved.