Bill
It might also be worthwhile talking to Keith in the workshop at BHM. Depending where you live and whether you need the car for a while it may be possible to get your engine driven pump replaced and initial poor installation fixed. I for one hope to go down this route on mine, when/if it goes. I'm currently at 55000km.
Cheers