Yes, Elon was pretty clear about that. His statement was unequivocal (paraphrase): “Tesla has no plan to switch to 2170 for the S and X.”
I think Tesla can get as many 18650 as they need from Panasonic. The S and X still have no real competition. The Jaguar i-Pace, Audi e-Tron, and Porsche Taycan ranges fall short of the S and X, and the Tesla Supercharger network is a huge advantage over those competitors.
There is no reason for Tesla to devote resources to redesigning the S/X pack for 2170 cells, cells that Tesla desperately needs for Model 3 production and for Tesla Energy products.
The current S/X pack capacity is likely to remain unchanged for at least a year, and my guess is more like 2 to 3 years. A range of around 300 miles is sufficient for the vast majority of potential Tesla buyers, and as the Supercharger network continues to expand, the need for longer ranges decreases even further.
That said, there are still edge cases where greater pack capacity would be desirable. I’m one of them. Towing a trailer with an X dramatically impacts range. I would love to have an X with an EPA rating of over 350 miles.