Hey, that's great!
On my Ford starters, though, the trouble was always shot brushes. The local hydraulics/starter/alternator rebuilder- NOT the auto parts stores, who only wanted to sell me remans or new- sold just the brushes to me for a very reasonable cost.
Went through the GoldWing starter in similar fashion and it needed nothing but clean 'n' lube.