The icp should be replaced and clean the contacts good. Just unthread and replace. The surge might be the IPR but just do the ICP first. If the engine oil is old and dirty that could be the surge as well. The hpop system needs good oil to keep injectors firing at their best.