You might want to check out Mysore Garage on street 48. the workshop in charge there is a former Mercedes-Benz foreman. He'd be able to take care of something like that for you - and I understand their prices are reasonable for services to.

www.mysoregarageqatar.com

this guy, henry owns the garage this is his number. he's always helped me out.
+974 55 85 6229