I'm a big fan of Black Diamond for headlamps. Make sure to get a waterproof one. I think Storm 400 is their waterproof version. They use AAA, but you can use NIMH rechargeables.
For handheld, Big Blue makes some great, high quality really bright lights. They are obviously waterproof, but if...