First thing I would check is where the wires come out of the end of the starter. These take a beating right where the hard plastic case ends. I had to pull mine apart and cut off the end of the wires and resolder. There were only a few strands left in tact.

David