Well I got it all back together and it seemed promising on the first drive, but the second it acted up again. I just cleaned (what I think is) the neutral safety switch connector (photos attached). Please let me know if this is the correct connector. It's the only barrel style connector I could see near the PHH.
One male end looked a little crusty so I tried to clean it with some tweezers. Sprayed some electrical cleaner in the female side. About to go for a drive so we'll see.
View attachment 2502661
View attachment 2502662