I get heated O2 sensor open circuit for code 9 HFM-SFI. The DM gives Air temp sensor for its code 9. The airtemp sensor won't cause the surging. The O2 sensor probably won't either although the code could be an indication of a vacuum leak or AMM problem (if the code 9 was on the HFM).
I'm thinkin that I drove your car yesterday and taking off I was in some rain water and your traction control took over. This would indicate that you have EA/CC/ISC instead of just CC/ISC. It would be interesting to see the codes on that module also. This would be on pin 14 of the test connector.
Bosch Master, ASE Master, L1
33 years MB technician