I also suggest adding a helmet light, I think it would alleviate some of your problems...