Looking for some advice on my particular debacle with BA rebooking a Thailand trip having now spoken to BA and not had a good proposal from them.

Originally booked using a 2-4-1 for Edinburgh - Heathrow - Bangkok return in February, Business Class. Booked the outbound and return separately as soon as availabilities released at T-350 days. They are separate booking ref's, and the 2-4-1 was retrospectively applied to the return.

I have just spend over 1.5 hours on call with an agent. The outbound leg has been sorted without issue onto the flights I wanted. That was easy. However when we came to the return booking the options are terrible because i am being told the policy they have in places only allows certain flights and classes to be booked. There was nothing workable offered on or around the dates I requested to return Bangkok - Doha - Edinburgh or indeed Bangkok - Doha - London - Edinburgh. There was a flight at a hopeless time in Business from Bangkok to Doha, then an economy connection the next day to London.... I also offered to start the return routing in Phuket which would be convenient for me. I pushed them, citing a few extracts of the EU261 as to their obligations and asked for an escalation with a manager. I was on hold for an hour while they explored it, all to no avail. I am told they will explore further and phone me back tomorrow.

While on hold i went onto Qatar's website and simply booked an Avios trip from Phuket - Doha - Edinburgh on the dates and times i needed, so ultimately have the return leg sorted. I can cancel this for a nominal £ penalty if I get a resolution from BA. But obviously i am not getting the benefit of the 2-4-1 on this, but moreover it shouldn't be my job to sort all of this out satisfactorily.

So.. What are my options here with BA, should I hang fire, phone back and hope a different agent will handle things differently? Should i cancel the return component booked with BA and just use my new Qatar booking? Or just wait a month and see how the sands have shifted..?