Not sure how different it is crossing the border via car vs airplane, but I finally took my .... back to New York after two very long years in Canada, and I did not have any problems. I had one PV in my purse, and a bunch of batteries, chargers, and some syringes in my carry on, the rest of my stuff was in my checked luggage (which included a 500ml bottle of nic juice). I would think you should be just fine ... happy travels.
** side note ** I haven't been in the Canada forum for a long time, so shout out to all my old Canadians peeps ... I've missed you!