Sounds like a pretty dreadful experience. I have London - Tokyo flights booked with BA for February 2024 and the club world seat map is currently showing the club suite configuration both ways (BA5 and BA6) so fingers crossed these planes are actually getting that upgrade.