2000 rpm is to fast for your specs. You probably want your total coming all the way in at 2500 plus.
Do you know what mechanical advance is in your distributor?
If stock unit without mods you could have 26 to 30 degrees mechanical advance you are adding 20 initial too. Not good.