Your battery sizes for the cars is way off. The Model S has come with a 60 (no longer available), 70 and 85 kWh battery. The 240 mile vehicle is the newer 70 kWh battery.

70 is 7 * 10. 7 * $3500 = $24,500.