Point 1 is nice secondary benefit that plays to the masses. Ignore it.
Point 2 is much closer, but it still focuses solely on trade and economics. Tariffs don't exist in a vacuum. They can be used to get concessions in other areas, not just trade. Other than forcing companies to move manufacturing of strategically important goods OUT of China, I can't guess what those other goals are for China. China is messing with us in so many areas that I can't guess what our strategic goals are.
It's much easier to see the non-tariff goals with Mexico, so let me use Mexico as an example.
The non-tariff goals were to discourage illegal border crossings, stop the caravans of migrants, reduce the flow of fentanyl, and reduce the negative impact of Mexican cartels on the US. Overall, the non-tariff aspect of tariffs has been a success with Mexico. The biggest failure so far has been President Sheinbaum's rejection on May 5th of the US offer to send troops to Mexico to fight cartels, but the US offer to send troops indicates to me that this was one of the non-tariff goals.