is yours the Premium R5 edition? if you think of LD20 as tool, then i'd clean, and move on. and not lose any further thought. for example, to me (and everybody else) smartphone batteries are something we just use and don't lose any further thought about (brand, performance curve, capacity degradation, replacement cost): when we feel that the battery has become poor, we replace it, and move on.
with the growing efficiency of NiMH lights (SC52, SC5, T01, all with beautiful tints) the 2xAA form factor is nowadays the least selling one, ask dealers and manufacturers. 1000 fenix lumens out of 1x18650 are pretty common, electronic side switches too, they are USB rechargeable and as inexpensive as 30$, and flashaholics have upgraded long time ago because they're inexpensive and fun.
for a non-flashaholic, paying 30-40$ for a flashlight is absolutely unimaginable, or paying so much to replace a working one (LD20) just for getting something compacter and brighter and more efficient, it's just a tool.
to me, fenix light isn't just about being a tool. but joy. and i enjoy spending reasonable money, say 30-50$, on something new, very likable. i am not a flashaholic but i'm fine to call all my stuff (flashlights, chargers, batteries, accessories, equipment) a hobby or collection. and tbh i only use my cheapest lights for daily duty, the ones which i don't mind dropping on any ground.
just a tool? then no upgrade. you enjoy and appreciate the fenix more than for its sole lighting capability? then upgrade. my 2 cents.
life is too short. fill it with joy whenever you can (time, money, opportunity).