Yes, I used the e36 switch. That was the easiest part of the whole project!
Anyway, here are some pics:

I just soldered the new wires onto the old plug to keep the factory wiring and locations:

Notice how close the fan is to the water pump shaft. Make sure you measure this before you put it all together. The engine doesn't really move forewards or backwareds, just side to side. I ended up having to offset the fan so the rear bearing carrier for the motor was above the pump shaft.

Heres the done deal. All of the wiring on the passenger side is coiled under the balck cover behind the headlights now, so it looks a bit nicer.

