I would also pull the battery and lightly sand down the contacts on the ground and Positive. I thought I had a bad starter for months even bought a new one when it turned out to just be slightly tarnished connections.
That's one thing I never did do.... Always do it on my other vehicles will give it a try...thanks