Do you mind sharing the name of the original dealer?
It would be helpful to others to know who to avoid completely and would also (maybe) send a message to that dealer that this kind of service is unacceptable!
Glad you are going to get it finally resolved!