I'm alittle late to the party but had to R&R 2 starters over the past couple 3 yrs, one on a 49 216 and another on a 54 235.
I tried to repair the 216 with new brushes and cleaned up armature to no avail. It would easily spin on the bench but didn't have enough torque to spin the engine.
The 235 starter needed too much repair (just about everything).
Replaced both with that NAPA starter you linked at around $60 ea.
which also included a new contact switch. No problems so far with either. They do require a core so if you go that route just take the old one wiih you.

Good luck
Dave