I personally enjoyed my visit to Doha when I was there over New Years, definitely more than I enjoyed my time in Abu Dhabi. The airport is close enough to the city that a 2 hour visit is definitely doable, and I'd certainly recommend it if you have the time!