Trump was correct, the trade deficit is Canada - $582 billion traded with an $18 billion deficit.
They had to add another category, services, to make it seem that Trump was wrong. But he was not. Trump said trade deficit and he was correct.
http://business.financialpost.com/news/economy/is-trump-right-about-trade-with-canada-it-depends-who-you-ask