I think it is probably a mix of the two opinions. Trump laid down the law to the NKs about the military capabilities and pulled the carriers over there, and the economic hits on the Chinese have them worried to.
You are probably right. I don't believe that Trump takes a one-dimensional approach.