I think you both hit the nail on the head. Umair's article gives too much credit to Trump's foresight and planning.
Could that "someone" be Stephen Miller (among others). His biography speaks to a philosophy and cunning way of thinking that would be whispering such thoughts in Trump's ear. Probably even reads Lil Donny to sleep at night.