A350 is a very capable airplane and converting A380s to A350s would fit the requirement while wiggling out of an embarrassing over order on the Whale.
787, nice jet but that's just another expenditure when cutbacks are clearly a priority and would leave the A380 over order in place.
J