Moving on with the engine swap from my black 5 (rotten shell) to my yellow 5 (blown engine). Managed to work through a few wiring discrepencies and get the engine running last night. Most pleased with myself :D
Now to tidy up the wiring positioning and put the radiator, intercooler and air filter on and then get on the road again.