But at this point, Trump has been re-elected with a greater margin so in terms of national interests one needs to assume the worst case (i.e. these tariffs/behaviour aren't going away).

Would it be better if they did? I think so, but as a European (but very very exposed to the US) I don't think that's an economically rational way to plan.