No, I don't use Leppa Berries. My SOS team has enough PP to chain up to 255 without need of restoring PP. When it resets to 0 I flee, recover at the Pokémon Center and start again. I actually don't think SOS battles are annoying, since you stay in the same battle until the chain is over. XY and ORAS chaining were way more annoying to me, since they are complex, and I always thought Masuda Method wasn't worth the time and effort. If you're interested, my SOS team is:
Kartana @Wide Lens - False Swipe, Aerial Ace, Psycho Cut, Cut (total 70 PP of finishing moves)
Kartana - False Swipe, Aerial Ace, Psycho Cut, Fury Cutter (total 60 PP)
Pheromosa @Safety Goggles - False Swipe, Double Kick, Frustration, Poison Jab (70 PP)
Tapu Koko - False Swipe, Spark, Aerial Ace, Acrobatics (55 PP)
Magearna - False Swipe, Thunder Wave, Fleur Cannon, Flash Cannon
Total PP of the team is 255, so when I'm out of PP I know the chain has reset.
Since I made this team solely to find a shiny Cutiefly, they are all immune to Stun Spore, except Magearna, but her role is to paralyze the shiny Pokémon in order to catch it when it's found, so it's not needed.
My search so far: 1500+ Cutiefly, no shiny.