Electrek is saying that the refresh S/X are all still using 18650s, albeit the latest 18650 cells, with improved thermal management. Tesla says that the 4680 gets 16% more range, although I am not sure compared to what. Anyway, 520 + 16% = 603.
You can start to see how the crazy quoted specs...