Rest assured... you can go to the dealer as many times as you want before your warranty expires. You WILL have this problem afterwards, and you WILL be forced to go to an autoparts dealer and fix it yourself.

You have been warned my friend, now go along and have your headlamps replaced.