Yes, not yet booked the ticket. The long layover (in DXB on the return trip) sounds like a nice way to do things satisfactorily - that is assuming the baggage can be checked to DXB (with the implication that it will later be checked on to DOH - NOT).