Remove the headlight trim piece! Two 8mm bolts (and careful detaching of part of the rubber seal) and you have good access to replace the harness.

The connectors are solder type, btw. After I removed the trim piece it was as straightforward as can be. One wire color didn't match, but set up the connector to mate brown with brown.

Now that I've given you the answer, it should take you 15-20 minutes. Detach wire at foglamp, push wire up, remove trim piece, cut, solder, wrap, connect connectors, test. Assembly is the reverse.

On the picture, I've already cut the wire (leaving enough for me to get to it easily), and the trim piece is off the picture to the right, still attached to the bottom rubber seal.

Attached Thumbnails

 

__________________
Prost!