Depends on when you want it. If you walk, they could probably sell it for +$5k over MSRP or higher. If you can still negotiate the price and get that $2k knocked off, that would be good. If you walk away, and order from a different dealer at a lower price, your wait time could be up to a year or more. Else, you'd have to hunt using
VIN lookup tool to find an unsold allocation... also time consuming.
Less than $2k over MSRP would be a good target... so if they cut the addendum charge and just left add ons, then that's not too bad.
Many people have paid markups - even on the forum - up to +$10k for Prestige. So, as long as you are happy with the price, do what makes you happy. They do have a low APR option. Just don't lease with those markups - you'll get hosed.