I am in the same boat, I locked the price in April and now it is August when i reactivated my contract. I am saving 4000$ on the base price. My SA is saying the similar thing that removing the option is going to rewrite the contract and change delivery date. I am holding on to it coz now FSD is...