Tim Forcer wrote:

I'll carry on using the Hybrios, if only because they do seem to hold
part-charge better than standard NiMH, but I won't buy any more.

Try one of the dozen or so alternative brands. I've has GREAT success
with the Kodak LSD cells and the Sanyo Eneloop LSD cells.