Sounds like you've been chasing your tail; the problem was with the fuel pump and distributor all along, and you were trying to tune around it. Now that you've corrected the actual mechanical problems, the tune is completely wrong (because it was made to try to cover up mechanical issues which no longer exist).