| Since the pump has not yet failed, I'm wondering if it can be saved. There is another post on this forum which seems to indicate that the reason the pumps fail is that carbon dust fills up the inside of the pump, causing it to short. Since you're handy with mechanical stuff (I'm not), it may be that you can dismantle the pump and get rid of the buildup of carbon dust.
It's worth catching this one early, as if the pump does short, it can take the wiring loom with it (so my MINI dealer told me had happened to mine).
Just an idea. As I said, I'm no mechanic, but it might help.
Oli | 
