Thanks everyone for you great advice.
Sambo I wish I had of thought about this sooner and done the "all-in-one" VZ option you have. Saves a lot of external plumbing.
Phil - I think my noisy pump is made worse by the fact that it is attached to a mounting bracket on the Fuel tank - nice speaker box effect I think

I think I will put some rubber around it and see if that helps.
Carter lift pump sounds like the go.
I think I read Shaun Mellish does Swirl Pots (I got my Water Header Tank and Radiator pipes from him he did a good job), I'll have to have a chat to him.
From a Fuel flow perspective I have a single line going from the rear to the engine fuel rail so I am thinking the following:
- Fuel tank to low pressure lift pump
- lift pump to swirl pot
- swirl pot to high pressure pump
- high pressure pump return (after regulator) to Swirl pot (currently goes back to Fuel tank)
- swirl pot overflow to Fuel Tank.
I think that what Mac VABCH mentioned.
Rgds
Gregg