I would suggest concentrating on AA power. There are plenty of good choices already mentioned. One less type of battery to store means less storage space used and more interchangeability with your other BOB gear, like a small transistor radio and PLB.