Hi Andy,
I will recommend to rent a car, taxis aren't very easy to find in Doha and they can be expensive if you rely on the limousine at the hotels.
My first month here I rent a car with Strong rent a car, I was very satisfy with the service you can check the website online.
Good luck.
N