You may well have other issues but I would change your fuel pump seeing as you have it on the way anyway and then take stock of where you are.
The seal kit for the pump costs about £70 from Audi but as far as I can remember dosen't include the long bolt seal!! but I could be wrong.
When I did mine I found the seals I removed all over sized. They must have absorbed petrol and expanded because after a few days they had shrunk back and were easy to fit. This is obviously ok if you can live without the car for a week.
It's a fiddly job but doable at home no problem. Just be aware the cap for the sender is a lefthand thread.
|