I agree with Malc, I am currently rewiring section by section as I work through updating various items. The repair CD has a wiring diagram on it although some of the traces are rather faint, they are all there. There also shows to be wiring available from BMW with the correct color coding, and I believe Wurth can supply the connectors, although I haven't been successfu in finding a distributor - the parts catalog is not very helpful. If you need the diagram, PM me and I will send you the pdf of it and a conversion of metric to AWG wire sizes.
Mark