"...take a Surefire E2E camping, but the battery life is so bad..."

While it can for sure be a pain in the butt, now that C123's cost a buck or so apiece, instead of $5 or more, I don't worry about that quite as much, I just carry lotsa spares with me...