At first, I thought you should double-check the rotor and distributor cap ... but that bit about getting a shock threw me!
That's dangerous stuff at a gas station, too, man!!
I dunno ... if your wiring is messy, get after that rewiring job -- see mine
Here.
