I didn't get a whine from my pump it just got lumpy running, engine stall but would restart sometimes straight away then a while after then not at all.
Audi don't sell the pump but the whole unit as one and i expect as it would have been for me scrap the car time. I bought this
Fuel pump #(don't remember what i had to do to make this ebay link stay here)
I had it fitted by the garage that recovered the car (to the middle of the sticks) and then had it fail again but due to it not being fitted right. It's a horrible job, i also needed some a new o ring for the long bolt.
I still get the smell of petrol in the car after brimming it or hard right foot and throwing it around tight left bends, but i've been putting off going back in the boot to fix it, i mean how bad can breathing petrol fumes be.