Have your oxygen sensors been checked if there operating correctly, It's possible with all the products that you've put through the tank might of damaged the oxygen sensors leaving this lingering problem after the bad fuel has passed through, The surge could be that the sensors are unable to provide a fast enough signal when it hits closed loop mode.

Just a hunch