I had the same problem,I changed the pump and 18 months later the light came back on, I took the car back to where it was fitted and they checked the pump over and said the pump was OK. So I got it mapped out £60 .I didn't take out the old pump or any pipe work so if you look under the bonnet it still looks standard