I’m doing LHR-GOT-DOH-BKK in April, was a fairly good deal <1.4k total incl the LHR-GOT flights in J, but I have built in the weekend in GOT on the way out because it is actually a place I want to visit and also derisks things somewhat- plain connection on the way back on the ground of worst case is just get a new GOT-LON flight.
There were similarly priced options via AY at the time, but I would rather than 2 LH than 1SH then one long LH with the added bonus of more TPs.
Will happily report back once flown, good luck with your options.