Tesla already ditched the aero wheels on the S and owners are pulling off the hubcaps on the Model 3. Range-killing huge staggered wheels are very popular on the Model S, that demand isn't going to disappear nor is demand for the top of the line model cars to have at least equal range to the Model 3... but buyers will start to vanish if the cheaper cars with better battery technology remain superior to the more expensive cars for long enough that buyers realize this. They can't rely on hubcaps to catch up with the new cell technology, and Tesla has never been able to keep redundant production lines going for long. Tesla *always* reduces costs and times for production, usually in a matter of months not years so I expect the new Model S and X second gen cars in that '3 months probably 6 months definitely' span we hear so often. I just don't see the old chassis remaining for an entire year, even in Tesla time estimates.
So, with the cheaper and larger capacity 21700 batteries being made in the gigafactory right now, there's no real future for 18650 in the next Model S, and no real reason to avoid a completely new car. The model S is 5 years old, right at the time the car industry expects a total refresh from any manufacturer. We've already seen a mild refresh so we know they're stretching the current design in keeping with standard industry practice and timelines, and now there's a reason to fit the new battery dimensions in a new chassis. They could re-engineer the current pack to fit fewer 21700 cells, and I hope they do because I'd love one of those packs myself, but they'll most likely just release a new car with a new pack; it's very unlikely the Model 3 uses the same modules as the Model S and X re-arranged for a less efficient composition of 21700 cells inside. The next Model S and X will definitely use the same modules as the Model 3 battery, again because Tesla has always gone with the cheapest production costs possible, so arranging those new modules full of new cells that are already in the Model 3 into a larger pack for the bigger cars is how the redesign will be based. If I'm wrong, great! But I just don't see a retrofittable pack for our current cars being a priority for such a short term and pricey effort. As soon as someone wrecks a Model 3 and that pack gets torn down, we'll know for sure, but my bet is squarely on a completely new module rather than the same dimensions as those used in the current S and X packs, and those modules are what determines whether we can retrofit into our cars.