Still trying to map out a timing curve

Okay, when I removed the distributor to lock the advance, the o-ring was in pieces and I replaced it. It also had a gasket, which I don't remember using, but I put it back in. I was never quite convinced I got the distributor to sit all the way in. Today I pulled the distributor, threw away the gasket and put in a smaller o-ring. I had to go two sizes smaller to get it to drop all the way in. Then I set the timing at 36 degrees. I used Crackedback's suggestion of 21 initial and all in at 2500 or so. Actually, I went 21 initial, 23 at idle, and all in at 2500. I also removed the rev limits. It runs beautiful. Hard and fast. I am going to add the rev limits back in and see what happens. I'm much happier now. Now I can play a bit and see what works best.