[Snax]

I think the best people can hope for with respect to battery upgrades is OEM such as with the i3.

Supposedly the 90AH battery is a direct fit for the older 60AH i3 battery, but any other option would require a complete system rehab or software hack that nobody has come close to making work. But i3s are hardly a 'best value' from a utilitarian view. I love mine, but it is getting significant style points in it's favor from me.