I think the symptom of no vacuum advance and then it all comes in with another 200 rpm sounds like a vacuum leak. That will throw idle mixtures way off and produce no vacuum advance at low idle.
When idling to set timing with vac line off, does the line have vacuum? It should. Tom