[Boxtaboy]

Before you swap out the light switch, try taking the headlight out and then reseating it back in the tray to ensure that the female connection at the back of the headlight seats tightly against male plug at the back of the tray. If that connection is not tight, the xenon light will flicker. Happened to me years ago. After I secured it, never happened again. Sometimes, the plastic post that the male plug sits in gets pushed back or cracked and thus, there's no support to keep the two plugs seated when the headlamp is pushed back in.