Why do you think they would use 18650 cells with new chemistry? (Genuine question.)
Because the 18650s FIT in the Model S and X packs (we don't know what it would take to fit 2170s). Improving the chemistry, improves the range etc. Why WOULDN'T they do it.
2170 is what they built the Gigafactory for, right?
Nope. They built the Gigafactory to produce battery cells; just that. Of whatever size, chemistry, pack configuration they need at any given time. If state of the art in batteries changes, do you expect them to demolish it, and build a new one? Neither do I.
I would expect them to retire the 18650's when possible.
Why would they do that? They may or may not have a use for 18650s. They certainly have a contract with Panasonic to buy 18650s for some time into the future. The 18650 may in fact be a better cell size for the Model S (or not).
As for the added mass, why would 2170s necessarily mean added mass?
No, More energy, requires more cells, means more mass. Absent chemistry changes, that is the only way to increase total pack energy. 2170s vs 18650 is pretty much irrelevant to that point.
the new cell design allows for more optimal cooling
Seems unlikely. Cooling a volume occurs at its surface, and is thus dependent on surface area. The new cell design has a greater volume to surface area ratio (cubed-square law). Thus it makes cooling MORE DIFFICULT. Whatever Tesla optimized for it wasn't (abstract) ease of cooling. There could of course be other factors, for example, limitations on minimum cooling tubing wall thickness, which made previous cooling designs inefficient (by dint of working too well). But absent evidence of that, it generally makes sense to reduce component size to increase cooling, hence margaritas.
Thank you kindly.