The surge could be caused by a suction control valve, a loose or bad connection on the common rail fuel pressure sensor. Wiggle the sensor for the common rail and see if it get erratic. As for the SCV if you gently tap on it and the idle smooths out you most likely have a issue with the SCV. It...