For me, Qatar J product is one of the top 3 J products i ever flew with. Better cabin, better service, better seat. Pretty much better on everything. As John Hammond used to say in Jurassic Park 'Spared no expense'. Which unfortunately is quite the opposite when it comes to BA.
Is any of your flights Qsuite? I doubt you will fly with BA again if you try the Qsuites.