I have strong misgivings that with Trump in power any progress will be made.  While the "good guy versus rogue nation" narrative plays well domestically, it's not a good negotiating stance, especially when dealing with certain Asian countries.  And you've got a President who is applying New York real estate wheeling and dealing principles to foreign diplomacy.  Plus he doesn't listen, whether through wilfulness or incapacity or both.  So, expect things to just get worse everywhere, for a while.