3.0 TDI

Hi all,

I hope anyone can help me, I have a problem in my C6 2004 A6 3.0TDI, one of the first ones here in the AudiWorld, and when the car had 2 years old it had a problem in the directional bi-xenon headlights, some times they entered in a "safe mode" and point all the way to the right, and it show up a warning ligth in the board computer saying "adaptative light malfunction".
The problem seam to be the left headlight and the car was left in audi dealer that time and it was solved.
But now, almost 3 years later the problem appeared again, this time problem is at the rigth headligth, making the headlights pointing to the rigth side again sometimes.

My audi dealer don't remember what they did to the headlights 3 years ago, and in the car historic there is no part or labour relationed to this problem! Apparently they didn't do nothing 3 years ago!!
Now I need to buy a new headlight, but I'm not convinced the problem is at the headligth, since the other one did the same thing and is still good for 5 years now!

Any one had similiar headlights problem with the adaptative ligth system?

By the way, is there any website I can check the headligths part numbers? So I can search on ebay for some used units, but with newer part numbers, since mines where the first ones to be produced...

Thanks for any help