A3/S3 Facelift headlights- Last time, I promise!!

[AudiPartner 79]

Performed a few searches on TS and elsewhere, and found various posts about fitting the facelift headlights (S3-Xenon). Strangely I'm not too concerned about cutting the wings, its the rewiring that I'm more sceptical about. Is it easy? I've already bought the plugs that I need, but I read somewhere that I may need to buy new wires as well. Also, amongst these posts I read that there was a german dude selling a kit that makes life a hell of a lot easier. I also read that Settle performed this job and avoided cutting wires by changing the wires inside the healight itself.

What do I do?