Found out that the cause of my particular problem of the engine surging with the check engine light on was a faulty/clogged Idle Air Control Valve. The diagnostic code was P0505 (per the dealer). They replaced it and all is good.