Two different places to look would be the headlamp relay (located in auxiliary relay box 3 which you should be able to find within the owner's manual) and the switch itself. Look for loose connections first since you say that a few bumps made it work to some degree in the past.
