Hi.
I don't know if they have already tought about this option, (i think they did) but there should really be an option that once validated, the game would ask us if we want to change our pokemon after beating each ennemi's.
Then we won't be forced anymore to waste a turn to change our pokemon and suffer 1 free damage turn.