After going through a similar situation over replacing my driver's side bulb, I'd say don't let the dealership touch it...do it yourself.

It may take a few tries to get it seated correctly, but basically there's a little tab at the bottom of the bulb that fits into a slot at the bottom of the housing, allowing it to snap flush into place.


If your headlight beam against a wall doesn't look like this then try again:

________________________________________________________
_____________________/ @


You really shouldn't need to adjust the (vertical) alignment much if the bulb is installed correctly. It's more for adjusting the aim height under heavy loads.