Especially on the 2L, good to kill the run-on ASAP, even by dumping the clutch. You may already know about the oil tensioner/jackshaft chain problem. 35B0 sounds like you've still got the smog curve in that distributor. Good to get a recurve kit (replaces springs and weights) or one of the EI replacements.