I replaced mine a couple of years ago as it was also
very noisy, sorry to say but the new one was quiet
from day one.
One thing you did not mention, is your pump outside
or inside the fuel tank,on the mk3 it's outside.
No point putting the old one back, eventually it will
start stalling the car, it did that to mine.