engine is surging while driving

Hmmm I wonder if its related to your timing issue?
Idles good but not good under load?
Dist bushing worn? Bent shaft?
New bushing, new distributor