Ok, for anyone interested, I have managed to fix the wiring. The short was caused by a failing glow plug, so I spent all morning replacing all 4 glow plugs - pig of a job, fancy having to remove the air-con compressor, mad!!!!!!
I also had to replace the wire loom for the glow plugs. Also had to...