Thanks for this! I had it wired up that way at the start, though. I only switched based on a wiring diagram I found here and second guessed myself. I was still having the same issues, though.
New solenoid gets here tomorrow. Fingers crossed! Will report back.
Also, noted on the ground wire...