After testing all the connections I decided to try a spare headlight switch I had. Problem solved. Lights are all working again.
Thanks everyone.