“Should we simply let ourselves fall into the Thucydides trap?” asked J. Stapleton Roy, a retired U.S. diplomat who was ambassador to China from 1991 to 1995. “Or is it possible that with skillful diplomacy, China could be stronger and more prosperous in 2025 and not a strategic threat to the United States?”
The short answer to the first question is "It depends." The short answer to the second question is "absolutely not."
There is no scenario where a People's Republic of China stronger and more prosperous than the US is not a strategic threat to the US. It's possible that we might avoid the Thucydides trap, but if we do, it'll be because something other than war caused China to stagnate or even lose power. The Republic of China wouldn't be that sort of threat, but there's nothing short of war that'll leave us with ROC control of the mainland. Assuming that the ROC even WANTS control.
The nation that cracks down on Tibetans, builds concentration camps for Uighurs, persecutes religions, and even squashed the completely inoffensive Falun Gong movement (c'mon, they're basically Yoga practitioners) with awful brutality isn't going to play nice on the national stage. They have territorial disputes with pretty much every regional power within their sphere of influence, and blatantly violate international law and the law of the sea in trying to enforce their territorial claims. This is not a country that is just going to rise into power without abusing it in ways that impinge in the strategic security of the US, or, for that matter, pretty much anyone else. This is a country determined to become top dog, by any means fair or foul, and which intends to use that position for it's own gain, to everyone else's detriment.