I had a kGo pass-through and Star Dust when I traveled to Cuba and I took them apart while standing in line and put the Star Dust in with the liquids (and
juice bottles) and the battery in with the keys and never had a problem on either end. Nobody asked a question even.
The Right Honorable Dusty D was in Mexico with everything, including the kitchen sink (and it was full of juice) and he stands here today alive and well. The Customs and TSB are very well acquainted with
vaping gear, and if you find one who isn't, for god sake Inform him! Lol Coming back to Canada with personal amounts is not cause for concern.
Don't exceed the liquid limits, remember spares of everything, spread gear around so it is not all in 1 case or bag.
Relax and Have Fun!