tstafford -
I think you made the right call - IMHO
If you cancel you lose $2,500 plus pay an additional $13,000 = $15,500
If you take delivery you pay ~$6,600 (that's whats been reported for the upgrade w/ labor) but forgo the 90kwh battery.
Net savings of $8,900.
Although you can't...