Try replacing the water temperature sensor (mine was on manifold towards firewall on top driver's side)....helped my idle with same issue after I replaced OVP and O2 with little improvement. I'm not sure where it is on that car. I have a '91 300E. Only thing I can think of that is related to something the water pump replacment could have an effect on besides ICV.