I am sorry for the experience. Perhaps it was just the people you dealt with that caused the issue.
Meanwhile, you should switch to Canon. I have been using their products for over 12 years (when I was 13) and have never faced any issue with the service or warrantee.
I'm looking into the Fuji X-H1 as a replacement currently. I own a lot of manual focus Nikon lenses that I still want to be able to use fairly well, and they'll work better with the fuji than they would Canon.