Yup, I wouldn't rule out trump deciding to end NAFTA right now, as another attempt at distraction. 
Of course, that would be another fiasco since it's not in his power to do it. But that wouldn't stop him trying.