A lot of people criticize the team preview feature for battles, but what if for Sun & Moon they incorporated it in a way that for gym leaders they and you have a team and each party brings a set number, and then later you can rematch them with whole teams. Kind of like in the show how the "league rules" generally allow for only 3v3 fights.