President Donald Trump may want to focus on China, but Iran remains a major portion of the global problem set he will face.