Think about this a bit rather than donning your WWI vintage helmet as you head for the woods.  

The USA has tried for solely internal political reasons, to kick Canada in the head in these and a couple of other ways ever since current agreements were in effect.  Black or white, male or female, city or country... their chief leaders are all the same.  Kissy-kissy until some Billy Bob senator calls for "brave action."  

Even our health care system (a global standard) has been accused of violating NAFTA terms.  Is that up for grabs too.  "Sovereign state... my butt!"

The two issues at hand in US trade are old hat.  The only way to solve them is to take these kinds of products first, then strategic ones and IP ones, to the world markets once again.  I suspect that Trump will not be in place long enough for us to use his obvious mental shortcomings as an avenue for departure - he IS after all the president of choice.  Let's get on with this before kissy-kissy confuses things.