Glad you got it sorted. When I took mine apart after approx. 6 years, the grease inside was fair and clean, but "caked" to the outside, very little grease left in the business ends lubricating...so I cleaned it all out manually (no solvent) and cleaned with rag wetted with WD40, dried and used high temperature disc brake grease (red so it was easy to see) and filled all the cavities and with the new starter clutch should work fine.
The solenoid area I wiped clean and did the same, burnished the high current contacts just a bit to get black off and could and wetted with just a bit of contact cleaner on a Q tip. Been working fine for 10 months now...and at least another 10 years (I am an optimist).