Mysore Garage on street 48 here's their website

www.mysoregarageqatar.com

The workshop in charge is a former Mercedes-Benz foreman. Knows the cars inside and out.

The garages prices are quite reasonable too.

Hope this helps.