Done!
Went for a short ride to get it to full temps. Dumped the oil when I got home and it was very clean. Feeling pretty good about the repair!
This is sorta like the belt drives needing to have the belts changed every 12K. So instead of that change the pump gears every 15K? The failure is partially heat related so if the bike never gets too hot they'll last a bit longer. I suspect you have been using the motor as intended (flogging it mercilessly). So one of those, next change will take half the time.