China does push for status quo to change and evolve to China's liking. So I don't think China would be fine with the previous status quo 5 years ago even without the trade war. Nor will China be fine with today's statust quo in 10 years. That is why I believe confrontation is inevitable regardless in what form. Also remember trade war is NOT the begining of such change, it was Obama's failed attempt of G2. Trump may be more dramatic in tactic but he is doing what the collective US ruling class all wanted to do, from Clinton, Bush Junior, Obama, Trump and Biden and will continue untill US is exhausted.
China isn't different from any rising big powers before. For example, US pushed UK and France out of Africa and Western Asia in the post WWII years in the name of decolonization, replaced British Sterling and French Francs etc. as the world trade currency etc.
To climb up the ladder, one need stick and carrot. The stick to break the aspect of old order that doesn't fit me, the carrot is to make the older powers to concede without fight. For the US, the stick is "decolonization", threat of sanction on UK and France in suisse canal crisis, the carrot is the marshall plan, access to US market and investment. China today is doing the same, BRICS is one of the sticks while Xi's partnership with US is one of the carrots. They are not exclusive to one another. One should not expect any of them to work one hundred percent either. It is a long game, nothing on tactical level is certain, only the final objective and trend is certain.
What China's seemingly "soft" stance is like how US managed to have Europe to hand over their positions in the world peacefully instead of what Germany tried.