I removed EAP and FSD on the 29th, hedging my bets presuming I was locked in to a sale that might not include a rebate. Would prefer EAP though. Now waiting to see how things play out longer term and will revisit a purchase in early 2019 with AWD and EAP.
I'm not sure how much traction your "incentives" would provide and again, it's still going to be seen as favoritism so I'm not sure Tesla would want to go down that road and if they did, I'd prefer more aggressive incentives like free EAP if you bought FSD. This costs them nothing and gets more people into FSD which they want.
No matter how I look it or what I dream up, I don't see any easy way of making something happen. As was said earlier, in a war you don't win every battle.