Solar Pathlight "18650" Battery in Brand New Light

Just purchased three (3) more brand new sealed in box solar pathlights today, January 3, 2025 - one to replace a unit that the battery will no longer charge plus the mirrored reflector in the light has completely worn off. The big issue that I have is when I looked at the date code on the battery in each one of these new units, it was XXXXXX-2020 - over four years old already and it is well known that these batteries simply don't last very long to begin with. Additionally - Ring (lack of) support refers people who bought these to find an aftermarket 18650 battery, which I have tried to find ones that work in my five other lights to no avail.What the "18650" battery nomenclature is referring to is the physical size of the battery, 18mm diameter by 65mm length.Problem is that the OEM Ring battery is 18mm diameter as it should be, BUT it is 69mm in length - 4mm longer than the proper 18650 batteries on the market. Has anyone found an actual 18650 battery that is the same length as the Ring battery that you do not need to modify the contact spring to make it fit, plus last more than a couple months?And why after all these years does since they use the same one in a couple other of their pathlights?That's just a brainless move on the part of marketing, because these in reality are a terrific light when they work.