The more Trump attacks, calls out and condemns China, the more voters he is able to get in line for him. The beautiful fact about this issue from his standpoint is that he knows that NO Democrat would dare do this. In fact, many of them have made it impossible for them to call out China, because, by their measure calling out any nation makes you a populist, or worse a racist.
Even if nations are openly hostile and abusing your nations, you are not allowed to call them out, and no Dem will in any meaningful way. Some exceptions have been made for Russia, N Korea, and depending of the mood of MSM, Iran. This is my observation, as someone who support Trump but tries to be objective about it all.
China, trade and illegal immigration are the hot spot issues that Trump enjoys a major boost of support from Independents and voters on both sides alike. As long as he know this and does what is right for America, he will be in a great spot against anyone. In my opinion, only a really naive, bubble dweller thinks climate change and P.C talk is a winner in 2020. He rejects both of these are major issues in a campaign.