I finally had some spare time away from schoolwork this weekend, so it was time to work on the car. Turns out, it was none of these problems!
I had decided to replace the fuel filter, because it was old and nasty and while rooting around in there I noticed a set of wires sitting very close to one of the pulleys. When I replaced the radiator the little fuse block going to the distributor got moved and the wires were ziptied out of the way, but apparently it had had enough and moved on to greener pastures. After inspecting the wires I found this:
WELL THAT MIGHT MESS THINGS UP A LITTLE BIT. the wires had been bouncing off the spinning pulley for who knows how long and it finally wore through the wire sheath and the insulation. So I cut out the old cut up parts and soldered in some new bits (the wire was a bit thick but it should be fine), wrapped it all in some conduit stuff, and now its fantastic! It actually runs better than it did before, which isnt surprising
A successful saturday morning, even if soldering it was the most uncomfortable thing ever.