Yeah, those Pangoro are no joke without fairy-type support.
Vivillon might be an option, being immune to ground and taking 1/4 damage from fighting, plus SE recovery from Draining Kiss and (way later) Giga Drain. The biggest issue with it is that it dies to a stiff breeze, a thrown pebble, a lit match, an ice cube, or static buildup. That said, it does learn Sleep Powder, and it probably can't find a way to kill itself on a sleeping opponent.
If you got Budew and it's female, or if you haven't gotten it yet and can still reset for a female, Roselia is an option. If you feel you can do the Shiftry fight after beating Shelly, you can get a male Nuzleaf, level it up to 36 for Extrasensory, then breed it onto a Budew.