I would take this starter to my local starter re-builder and let them have a go at it, it is mostly parts that are stuff they may have on the shelf.
although, the symptoms you mention are more often caused by dirty battery posts and terminals, so I would have been tempted to test with a meter for voltage drops before I pulled the starter out.