Worth noting that QR have been playing hardball with some of their rescheduling and cancellations, so it would be sensible to ensure any financial commitments made for your stay in BKK are changeable or refundable at short notice.

Also your travel insurance is probably not going to cover you for delays, cancellation and anything that happens whilst you are in transit in Qatar due to FCDO advice. There are some insurers who will cover, for a price.