What do you mean by "noticeable surging of engine speed when you stop"? Does this mean the car won't idle in gear but speeds up when you shift to neutral?

I think it is very unlikely that the mass air flow sensor has anything wrong with it unless both of these are true: 1) there is a specific code set for it 2) the engine will not run at all or dies after just a few seconds every time you try to start it, warm or cold. Failures of the MAF are rare but do occur.

I assume you have the electronic throttle module. If this were my car I would do the following:

1) pursue the idea that the ETM might be bad and get whatever recourse is being offered (many posts on this site discuss this).

2) verify that the electrical/charging system is regulating the system voltage ok (near 14 to 14.2 volts) and that all the primary wiring (battery, alternator, ignition switch) is intact.

3) clean out the throttle body and air intake system of any carbon, oil, or other dirt that might block it or make it sticky sometimes. At warm idle there is very little open area to let air in. The engine electronics normally regulate the idle speed but only within a certain range. Even a little dirt can cause the air flow to end up beyond the limit of regulation. I have had few or no cars that did NOT eventually (after several years or more) have a problem like this - solved by cleaning. Sometimes it was stalling, sometimes idling too fast all the time.

4) check for dirt in fuel system - dirty filter, tank with dirt which is sloshing around in the bottom, etc.