Marc,
You might want to consider using a new loom, I got one from Langys Rod Shop and it was a dream to fit and cheaper than messing with exisitng 30 year old wiring that was suspect to begin with.
http://www.langysrodshop.co.uk/wiring_kits.htm
HTH
Mac