Finally got the fuel pump sorted after much swearing and frustration. But its all wired up and working fine for now. They are a very noisy pump; especially with the interior stripped out.
Next on the list are tires, the oil cooler and return flow intercooler as well as stripping out the sound deadening and painting the interior.
Amir