I did this on mine, got the light switch (with fog part) and the front wiring loom, fitted straight together and all worked. I did notice that in one of the relay slots of the fusebox I had two pieces of metal, this acted like a crossover I believe. (This was already there...)
Will