Having roughly the same problem...
I recently resealed my engine, had major oil leaks. After getting it back together with new fuel filter, air filter, plugs, cap, and rotor button. My idle is not smooth either. It surges between 500 and 2000 rpms. I have checked the setting of the cam gears, crank, and distributor. I believe the plugs to be gaped correctly. Been a few weeks since I gaped them but believe it was .44. The other day when I tried to start it it would idle smooth, but not rev up at all. So the next chance I had I went ahead and "re-aligned" the timing marks and came up with the surge. I cannot check the timing because of the surging...any suggestions?
(Edited to add a thought.)
Was reading another post and thought of something...if my O2 sensor accidentally got some paint on it would that have the same effect? I painted my manifold with high heat paint and may have gotten some paint on the inside before I thought about the O2 sensor....