Once again we are in similar boats! ...I've been looking and Musk has tweeted that two - three years or so from now we can look for an updated roadster He says it will be slightly bigger. I'm avoiding Gen 1 for other reasons...look up Tesla roadster brick. they actually need an entire new battery if the battery gets fully depleted.