Here's my suggestion -- JUST BUILD THE DAMN WALL USING OUR OWN MONEY. Forget about forcing Mexico to pay for it.
They keep talking Infrastructure... well there's one right there ( and it's part of NATIONAL DEFENSE and HOMELAND SECURITY TOO ).
Trump seems to think that Mexico should be held responsible for Trump's campaign rhetoric. We don't have a beef with Mexico, which is a good neighbor and trading partner. But Trump is insisting on picking an unnecessary fight to avoid having to back-peddle on what he said at his rallies.
Trump needs to be honest with himself - he said a lot of provocative thing at a time when he figured he'd never, ever actually be elected President. Well, the dog's caught the car, and he's got to grow and admit that some of what he said was schtick.