No I think you're thinking of the airport road when you mention those landmarks; this is b- ring road...

On old airport road, going from toyota signal to crazy signal turn right at the crazy signal and capital police building; you'll see many car shops on the opposite side on your left as you drive; you'll have to make a u turn from the next signal which is sana signal. The shop itself is called al firdous and is immediately next door to a small car wash, left side door. Sorry, don't have a number for you and I'm out of the country myself; else could've got it while passing by. Just find the shops and ask for the guy. They all know each other so you'll find him easily inshallah. Best of luck.