I have this problem on a YJ pump the best I can figure is that the vanes are getting stuck in the rotors. Are you finding particulate in pump and on the vanes (vanes feel gritty until cleaned)? I was thinking of installing filters before pumps to try to avoid this, but particulate only filters that can hold under a vacuum is proving to be tough. I don't know where this scat is coming from. And yes doing this is a pita, a mess and a waste of time.
It's not what you're capable of doing that defines you, it's what you do on a daily basis.