Options, opinions and suggestions for angel eyes on 2003 X5

[mogm321]

Hi Guyz i recently bought a 2003 X5 with factory Xenon and i would like to update the look of the headlights by installing angel eyes on the headlights or changing the headlights altogether. I would prefer to keep my orignal headlights and just install the CCFL kit. Do u guzs think is it best to remove the lense/wafer and corner amber plastic and the install the headlights clean with just the ccfl and everything else exposed or not to remove the lense/wafer and just install the rings. Plus if anybody has tried some aftermarket headlights which are oem quality that would be great too.
I have tried to contact Dave at custom angel eyes but so far it has been more than 3 weeks and no response.
Also the built date on my headlights is 04/2003 so i think they would not be very difficult to open. (I am getting a BMW technician to perform the surgery)
Thanks in advance for any suggestions / info