I have done option B few years ago. worked for a while but keep coming back.
Now I have the 3 Amigos and the Brake light on Permanently. Can't erase with USB Amigo or other scanner. Time to time the Pump will come on for no reason while driving but does not do anything.

I went ahead and bought a used pump. Do not know if that is any good. But I am willing put in to see what happens.

Current fault code is

1.--Current Faults---->
Active Faults:
012:Pump fail monitor line
Logged Faults:
012:Pump fail monitor line

 

Looks like I found my problem. C0507 was open for some reason. After cleaning and reconnecting all lights went off. hope this was my intermittent problem too.