FWIW, it's now possible to retrofit later model year batteries to older Leafs, giving you a replacement path which is much cheaper than the factory solution and will substantially expand your capacity-- something to keep in mind as you tire of fighting with the diminishing range. :)