High NOx often indicates lean mixture, as you are suspecting. The mixture can be adjusted on many FI systems. May not get at the root cause, but may get you past the test.

__________________
1986 300E 5-Speed 240k mi.