You are our hero, at least for now! My husband followed your instructions and cleaned the oil control valve filter. He figures when the guy took everything apart to get to the head, he stirred things up. Husband then disconnected and reconnected the battery. I drove the car afterward, further than it took previously for the check engine light to come on and it never came on. Also, we had both noticed it being noisy after the head gasket change and it ran great this afternoon after the filter was cleaned. It will probably be a while before our paranoia subsides and we quit expecting the CEL to come on but we both really feel you gave us the solution. That seemed even worse than the oil leak to us. Too bad you can't work on that!
Thank you so much for the suggestion. I guess that makes your odds better than 9/10 now!