[quote=@anothered]
<Snipped quote by Lewascan2>

But then, one person would control two characters in one team.
[/quote]

The solution is actually fairly easy, as Bee asked shortly after me if Ren could be under Hikari as well. So, if it works for you, you could just swap them, have Ren on Team 2 and Satoshi as the Jonin of Team 1.