mako light cutting out - suggestions?
 

Hi folks,
I have a couple of Mako 1 lights, which I use strictly for commuting. I've only had the lights for a year or so, and I notice that they've started cutting out during the ride, something I believe is due to two things: the jarring that happens when I go over uneven road, and the rather sloppy fit between the light and the mounting bracket.
I don't have my receipt, and I don't really feel like jumping through all the hoops that a warranty claim would require, especially given that the lights only cost around 30$ each.
Has anyone else experienced this? If so, and suggested fixes? I'm thinking an adapted mount or something like that.

Thanks a bunch,
Neil