Well, Getting the baseball bat ready to smash the lights up! Got the xenons fitted but they don't autolevel, drivers side points down, passenger middle/up. I was illuminating the top of a double decker bus earlier on and that was while being right up its backside!

Beam doesnt work either...bulb warnings every x mins... arghhhhhh

I dont know, I would probably go for option 1 in your case if you have the patience to get it working. Remember mine are from ebay germany but geniune Audi OEM xenons. The main issue I am having is understanding the concept of these two extra wires that need to be connected to what the Germans call a "headlight controller" or "control unit"

I have no idea what and where this is and so I can't get it working properly. The fitting itself I could now do with my eyes closed and the only frustrating part is a hidden bolt in the bumper to remove it which you need an audi tool (cost me £7 from Audi) and small hands

Once thats off, the headlamp bolts come off and it's easy to bolt on the new lamps.

It's what happens after that's the problem - in my case, these two wires from the halogen>xenon adapter (the standard halogen adapter does not fit which I found out after fitting the lights in!)

I could probably help you out if you went for option 1 too

As for option 2, my only worry about that was if the fitting was different so I didn't want to risk it. Atleast this way, its genuine and oem for this current shape/model so its ok.

LED: I would love to have the S6 ones in but I'm not cutting up the bumper. Already snapped off more clips than I would have liked to.
Mind you, all the clips broken are from the halogen and xenon adapter/cable so atleast it's not all over at random places!

The other thing with the S6 is, would you not need the daylight led module too? I'm sure I read that it came with 3 wires - in my case, I dont have the module and it's just wired to the sidelights