FWIW I called my SA today asking if removing FSD would have any effect on price/delivery date. Since I ordered before the price changes, he said removing FSD from my order would change my vehicle to the current price. He also said that removing FSD could change my delivery date.
Ouch. SA has you by the short and curly hairs. I'd escalate - it's worth $10k to me. And I'd even forgo the $500 / $1000. FSD is simply not worth it.