Put a slot or mark on the damper 2 3/8 " clockwise from the TDC mark this is 36* .
disconnecting the vacuum advance is the first thing I would do , total timing is basically more important than base timing as the engine spends most of its time at 2500 rpm or higher .
I time by ear so bring the engine up around 2500 -3000 rpm & advance the timing to where the rpm just stops rising back it off just a hair so you are on the cusp of where the rpm stops rising & goes flat & lock it down , this way timing should should be around 15* at idle .
if the surge is still there the advance weigth springs could be too light or it could be fuel related .