Thanks for the suggestion.

Would prefer not to backtrack. Perhaps book LHR-BCN and upgrade that sector, and return MAD-LCY in Y (I believe the aircraft's J hard product is exactly the same)? Also makes sense as we'll be directly connecting off QF1, and have 24 hours in London before returning on QF2.