I have never had an Eneloops go completely dead on me while in storage, but I have exhausted a few in service. I have charged them right up, both with solar panels and 120 AC.
I keep several NiMHs on hand, nominally fully charged. When I go out on a trip or a project, I pop a few on the charger to be sure they are full. Usually only takes a few minutes.I also routinely carry AA and AAA lithium primary batteries. Each will power my headlamp and my EDC key chain light.
The tendency seems to going toward lights, etc. that are directly rechargeable - no removable batteries at all. You simply plug in the appropriate charging cable.
The day will come when i will take to the field, carrying phone, lights, GPS unit and whatever, along with a power bank and maybe a solar panel. you simply move the electrons around to where you need them. A good many power banks are also adequate flashlights.
_________________________
Geezer in Chief