SV, good luck with sorting things to your satisfaction. Be firm and confident with the dealer because you are most definitely in the right.
Let us know on this thread what the specific outcome is, because it will interest and educate us to the pitfalls and outcomes going forward during a difficult time for both manufacturers and customers.