This almost reads like that chip shortages will actually continue to at least 2025 if not longer.
For those cars that do suffer from range degradation (eg: 2011 Nissan Leafs), battery swapping has become common, and at a reasonable $3500 and up price point: https://evridesllc.com/battery-upgrade-service/