Since the oil pump went bad, I would pull distributor cap off and wiggle the rotor to see if you have a lot of play. Maybe something is wrong on the bottom of the distributor. Another thing to try is pull the spout wire to see if it will settle the jumping around. Timing belt ok?