It sounds like you've got the problem solved. I'm very fortunate to have two rebuilders within driving distance who do excellent work and stand behind their products. One shop is about a 15-mile drie from my farm, and it's owned by a 2nd. generation member of the same family. They've got a huge stockpile of old stovebolt starters and generators, and the man who runs the place is very experienced at rebuilding the older stuff. The other place is about a 2-hour drive, and they specialize in antique electrical parts, even back to the T-Model days.
Jerry