If these were the reasons for the U.S's actions I would agree with you more. I think only international pressure can help with these issues. The Chinese people themselves can do very little given the realities of their country's surveillance capabilities.
But let's not nobly kid ourselves that these issues have anything to do with the cause or the possible resolution to the trade war.
We're running a marathon and I'm currently winning but you're catching up. I'm confident that I'm winning because I take 10000mg of vitamin C every day. But also I'm going to pour burning asphalt on the road behind me.
When you lose the race, are you going to reconsider not eating vitamin C every day, or will you blame me for pouring burning asphalt on the road?
They are not staying in the US because it's 'freer'. Increasing numbers are leaving once they got what they came for.