Anyone else have this problem?

So my starter started acting up(would just click and had to keep trying until it would finally work) and I pulled it and found the solenoid contacts to be pitted and corroded and figured I go buy a rebuild kit from the dealer like I did for my older Toyota truck a while back.

Problem is that the dealer doesn't offer the rebuild parts for the starter. They didn't even have the starter in stock and said it was a special order. Same thing with Checker and Autozone.

I ended up just cleaning the contacts up and put it back together and it's worked ever since. I know it's only a matter of time so I thought I'd ask to see if anyone has any input about a rebuild kit for it or if they have had any problems with their starters on 4th Gen

Its a Denso 28100-31050
428000-1250

 

If the contacts are like any of the ones below:


They are available here:
http://www.4crawler.com/4x4/CheapTri...OnlineOrdering