I just had a similar issue. I pulled the 7.5amp clock fuse to reset the ECU. Then started the car and let it idle for about 5 minutes. Solved the problem.
Mine started doing this after I degreased the engine. I drove about 150 miles with multiple engine starts and it was still doing the surge thing even after reseting the ECU. Then did the ECU reset with 5 minutes of idle (no reving and AC off) and the problem was resolved. This was at Bryan's suggestion and worked.