@Tyki_Mikk
I think you are going a bit overboard on the Queen fight and it's a bit ridiculous for you to say that Queen didn't live up to his hype as a Calamity. Before Sanji got his power up, Sanji was having trouble fighting Queen and Queen almost killed Sanji if it wasn't for plot armor and power up saving him.
Queen was fighting Marco, Monster Point Chopper, and then Sanji, Queen did prove himself to be a very strong character. Even if the last fight between Queen and Sanji was a bit underwhelming that doesn't mean Queen's portrayal was bad or that he was weak, the problem is how Oda portrayed the fight and didn't even make the fight last two chapters.
Also if you put the all the Sanji vs Queen fight panels together(Which is something I'm planning to do) the fight overall is not that bad, only the ending is a bit underwhelming.
If you are talking about portrayal as a Calamity you mean Queen using his plagues during battle then that I can understand.
Also this.
queen and king are not weak
zoro and sanji just got that much stronger.
Both King and Queen did prove themselves to be very strong, it's just that Zoro and Sanji are now much stronger.