Welcome to FT
citiflyerUK. ^
You can upgrade an O class fare for the change fee (GBP 100 each) plus the difference in fare.
GBP 800 per person each way seems in line with current fares plus a GBP 100 change fee.
The flight to DOH is quite long due to the stopover in BAH. As you are both in secure jobs I would certainly take that upgrade!