We also moved from AD to Doha years ago and we still regret it. Doha is small place and rather boring (especially for the kids). Social life is much more developed in AD and infrastructure is much better.

Yes, lots of projects are announced in local newspapers in Doha but nothing happens... The new airport should have opened in 2008 and is still not finished. Traffic is pure horror with aggressive local drivers... Stay in AD for another 2-3 years and then reassess.