Both Swiss and NZ have excellent service and I would switch for either though I think it is unlikely you will find two seats before BMI folds diamond club (~14 days?), but if you did then definately a worthwhile switch - you can save the Avios for another day as BA isn't closing as quickly as poor old BD