I have also booked with Qatar Helsinki-WDH-Helsinki in February 2018. Direct flight to Windhoek is very nice especially considering that Comair does not transport bows (is it still valid?), no paper work required when travelling with a minor child, and also I have been travelling through JHB so many times over the years. Also the ticket price was cheap compared to Air Namibia flight from Germany. I have been travelling in Arab countries (Turkey, Jordania, UAE, Oman etc.) a bit and never had any issues, you just need respect their culture rules. We also have one 9 hour or so layover; I have not checked that city tour option (never been in Doha before) yet. But please let us know how your trip was. Thanks!