Thank you all so much for the replies, im no doubt gonna do the fuel pump aswell,

Just out of curiosity when i re-done the fan circuit i ran an earth back to the battery, (Not earthed onto chassis) i connected the earth Fan Switch and the earth for the Fans in the Same wire. Is this ok.

Also does anyone know how i can make the connector (In my Pic C and D) redundant and have not power,

Thanks Guys