For the headlamp, a princeton tec EOS cost the same at MEC, is waterproof, better LED, and better electronics, I'd switch to that.