Every time I replace a head gasket I replace the cups, you would be crazy not to. I agree with Greasy you got screwed there. Id be suspicious of the CEL as well, they could have left an injector solenoid screw loose when they were under there, or the jumper harnesses under the valve cover are...