Looking for more pep off the line

Let's bring this back to a strategy that I would recommend for this situation.
Limiting the advance shouldn't be needed because 3000+ rpm tuning should be put aside until the foundation is put on solid footing. That said, we know some people just can't resist their urge to floor it.... so this assumes Alecb, you have the patience and interest in solving first problems first.

First problems here are:
a. Some fault in charging system (that can be worked on with the current tune just as it is)

b. Idle and off-idle needs performance tuning and testing. (that can be worked on with the distributor as it is as long as that includes timing vs rpm measurements. Without those, then after making internal changes to the distributor you will be starting from scratch). You can drive it on the local streets, but avoid flooring it or high speed stuff.
Follow what @Mattax is going to guide you to do with the ignition. He'll show you how to graph it out and actually learn how to do it. My way will give the same result, but leave all that out, because I've done it so damned much, I know "about" where I am with it without all the fancy graph work. You need that though, so you can actually look at it, see what's going on and change things accordingly. You're in great hands with Matt. Just don't get off the rails with somebody else's bullshit, because Matt will get you right.