You might also check and see if your vacuum advance is working or not. You might have a hole in the diaphragm which will give you a vacuum leak as well as timing issues.

Kurt