Time to find a new one.

I would go to the new one, ask to speak to the service manager and let him know what happened. Let him know he can earn all your business but you will NOT be treated the way you were at the other place.

I'd also visit the other dealer (after finding a new one) and explain why they lost your business.