Ok, thanks! I think I got the last point wrong, the Avios ticket would be the last segment of the return flight, so then it would be DOH-A. In any case, it does sound very complicated and as you point out any repricing might turn out to be overly expensive.

Will have to think of some other solution, or just buy the Qmiles needed for the upgrade. Thanks