Roger, I am glad that you've attacked the distributor. I did some radical stuff in there (as you've discovered) to try to get driveability back when I was struggling just to get it to run! With the new build, I was certain the "curve" I had put in wasn't needed... indeed was probably dangerous... and I wanted to go un-do it. I just couldn't psych myself up....
I feel much better now!
Go, Roger, GO!