I did notice that the ground on the switch was unhooked. Is that normal or am i supposed to ground that terminal? The plug only has enough terminals for the other plug and that one is left out.
The early headlight switches didn't have that ground lug. Later models did and all reproductions do have it. I dont think it is related to your problem.