OP here, just as everyone said, it was indeed the contacts. Getting the starter out was a royal PIA- other than that, easy job. Spent a good hour trying to wiggle the starter out, rest of the job took 20 minutes. I used this kit.
Amazon.com: Victory Lap ND-34SOL Solenoid Repair Kit : Automotive