Problem solved?
Tho it seems all's well that ends well, you might try fltplan.com's app for your Canadian charts, APD's, IAP's, etc. Tho' I use WingX for US, when I go to CYTZ, I rely on fltplan's DL. Regardless, I have had the same easy-going experience you have with Canada's border servants, just nice people to deal with; same with their controllers.
Good luck with your return.
Cheers!
T