Time for Trump to declare victory in the trade war. Just lie and say everyone else made concessions, like with North Korea. Trumpists get to enjoy a win (in their heads). The rest of us get to enjoy improved global economic conditions (in reality). Win-win.
I think you're right that he cares about trade and thinks the trade war strategy is a good idea on the merits. At the very least, it's a position he's consistently advocated since long before he ran for president.