It's not that one battle that's the problem.
It seems now that if you have a speed advantage you can swap pets without costing a turn, and stuns on you wear off immediately at the end of the turn you were stunned, thus not losing a turn.