You don't have a short.

But, I'd bet the connection pins in the plug to the back of the headlight are not in good shape. Pull the plug from the headlight and you can probably disassemble it to clean the pins. Make sure the pins go back in the same slots.