Happy to report that after a long 47 days of waiting, I was finally able to take delivery of my new Red/White Performance M3 with FSD.
We asked about the 2 years of free supercharging and after the manager checked he said he could add it right then. We then asked about the deviation discounts and he said he could only do one or the other. Since we don't really supercharge much with my wife's M3, this was an easy decision. In the end I was able to get the paint and interior waived. They even let me keep my original pricing for the performance model which was before they raised the price in August.
Painful wait time. Fortunate timing and savings in the end. Good luck, friends.