Sounds like ECU related problems. In the case of my 88 560SL, the culprit was the sensor that inputs engine temperature to the ECU. It was easy to change that accessible and relatively inexpensive sensor. Try to isolate your fault before simply changing every high dollar item in sight.

Yes; idle control valve. Cleaning it was a good thing to do.