I am sure it's still under warranty, and why not let the dealer worry about it? If the problem keeps coming back, request the dealer to change the whole headlight assembly....keep bugging the dealer 'til the problem is solved...

Andy Kuo