A "D" cell LED flashlight that was regulated (AFAIK Maglite D cell LED flashlights are not regulated) probably wouldn't need spare batteries or bulbs.

I'd replace the flashlights with the Underwater Kinetics 4xAA eLED, which is waterproof to 10 meters.
_________________________
Better is the Enemy of Good Enough.
Okay, what’s your point??