Just to give you an update. I took the car to another mechanic a couple of months ago, and he replaced the pump and followed the instructions in the tsb. He also cleaned some corrosion on the relay, and the pump has been working with no CEL. I guess all I needed was a knowledgeable mechanic.