I actually think it's worth the connection to avoid the 787 long haul, and BA have a particularly tight version of it in Y too. the A330/340 is the most comfortable plane there is in Y. I actually made the same decision for my trip MEX-LHR, I'm flying Iberia through Madrid even though BA direct were the same price. 11 odd hours in a 787 in Y is god awful. The long haul part is what will affect what state I arrive at destination and a 2 hour flight at the end is by the by for whether my experience is horrendous or reasonable, I know if its off a 787 I won't have slept and will have spent a long time in that fight purgatory of the flight time remaining never seeming to get less. An A340 I can actually enjoy, it really does make that much difference to me. And I'm not even a big guy.