well think I told you to do reverse engineering..start with the Pandera diagrams, they are good and your car is NOT much different in respect of "what goes where". The diagram you posted might be good for an overview but a night mare to really fix the loom.
on color code well I did try Italian restaurants..
,, look for an older fellow ..no honestly this did work.
And again USE the PANTERA tech diagrams. All you need is there, as it is a logical view (in Architecture terms) (shows all needed links without if it is front or rear or any. and it splits it up in "subsystem" level..) this is waht helps you to rebuild the loom not a physical. I did the full loom on my basement table is a peace of hard work and top organization required ..
What I saw from above is right put the loom out AFTER naming all ends to from where they come from. Have a big ply wood or sort of thing add nails in the needed bend corners etc..that will work. I added/replaced app 500 meters of new cable.! Also as you replace with the CORRECT COLOR you can reduce quite a bit of the cable diameter as modern cable is more Amp "resistant". This helps to make the bending of the loom as it goes back more flexible..
..also as a above RE-ENGINEER head lights and cooler fans..
my 6 cents..happy to help..get you some pictures of my set up later..on a run..
Matthias