Nice analysis.. but this is assuming that from the point at which tesla started selling M3s at scale to the point at which they will sell the shortrange version there is no cost improvements to the battery cells themselves.
I am willing to bet that when they start selling the short ranger...