Check the headlight switch assembly too. I had a problem where my driver side headlight would randomly stop working. It turned out to be the switch. You can take it apart and fiddle with the brass contacts, or get another from the scrap yard. I did this and it's been fine for years now.