THere might be another battery capacity upgrade down the road, but FWIW, even the original one, for me, has plenty of range for my typical use. Resale value is the worst part of short range, though, not necessarily functionality.
2011 535i x-drive GT, 2014 i3 BEV
Soon (hopefully!) A 2021 X5 45e will replace the above