At least with BA you have a more consistent chance of getting either two options, NCW or CS. The first BA A380 with a total refit is due in April next year.
Compared to Qatar Airways where you have have a very low chance of even getting Qsuite due to the multiple seat variations.
Nonstop Dan made a great video earlier in the year about their failures.