Hi WK,
Good to hear you found a solution, and good to know about the higher-powered D-cells.
Another option may be one of the Li battery rebuilders online.
Several are replacing older tech with newer, with more capacity, longer life, etc.
Just watch out for cheap, un-regulated fire starters! : -O
Thanks and good health, Weogo