With an extra 50k Avios (or even 30k) I'd say that BA is effectively cheaper, assuming you ever manage to spend them!

I think it would come down to the hard product for me, and while I'll take QR J all day long over CW, I'd value the extra space and privacy of BA F for a long flight like that.