I will also rec FS Doha. While not the best property in the FS portfolio, by far, it does have a good spa.

As for Doha itself, I highly recommend the Museum of Islamic Art, designed by IM Pei. An absolutely gorgeous bit of design and architecture.

Then, if course, there are the souks and dessert excursions, should you wish.