upgradeable;battery

In X years I'd like to be able to replace the battery with one that has Y% increase in the charge density so I can go Z miles farther on a single charge. In X years I'd like to have higher performance off the line and go to 0-70 in less than Y seconds and capture Z% more energy braking. Other...