If this is your second one that surges, I'd look somewhere other than the engine. It has to be fuel, fuel tank, plumbing, glow plug or adjustment. Are you running fueling valves? If so, get rid of them as they will not work with the high pressure a YS can generate.