Quite a while ago now, but I did fix my problem. Turned out to be the main computer located in the passenger side foot well. Put in a used one, started right up and has been fine ever since. Another issue was the transistor pack (?) I had bumped when replacing the battery, so sometimes only 3 cylinders had spark! Alternator had been failing as well, so it was a combination of actors. No hiccups since then, which is fortunate since I bought all used parts.