The CEL had always come off and on even before the water pump service, but the car ran fine up until the water pump replacement.
Well, here's the progress on the SHO!
I replaced the CAM sensor with a Wells one from Autozone two days ago, recleared the codes, and ran the car for about 40 min...