Sorry to here of your dilemma. Always frustrating to have to deal with camera service. I've had my share! I must say though, Canon CPS program is excellent and they really do their best to make things right, and quick. I've had many a share of things ive broken of theirs!
I've also dealt with Fuji repair. It was like any consumer customer service center. Send it in, we'll fix it, and send it back when its done. No regard for pro, or expedited needs, or loaners etc...
Olympus service I have dealt with a couple of times and I have to say...they have been stellar. They don't have a pro division...but if you are sending in their "pro" line of gear...they can "make things happen" if you let them know. I have been thoroughly surprised every time.
Leica...I didn't get past the phone with Leica. I thankfully found independent repair service even for their latest models. (DAG Cameras! Super awesome)
Hasselblad direct service...super poor communication...good technicians. Super long wait times. Go through your dealer like Capture Integration or someone like that!
Service is one of the reasons I stick to certain brands. Right now its Canon, Olympus, and Phase One. I need my stuff to work, and when it breaks, I need things done fast. Having backups is not always the proper response.