Getting really frustrating now.
So far I've had the N80 Solenoid Valve replaced, and the N249 Diverter Valve replaced. Sitting in traffic this morning at idle and the light has came back on, probably 10 miles after changing the DV and having the system reset. Again, no noticeable degradation in performance and fuel economy.