redtruck65MA,
Your diagnosis is probably correct. If you value your time, a new or rebuilt starter would be the best plan. Dinking around with a problem starter, or trying to fix it a piece at a time is a real drag. Replace it and be done with it.
Stuart