Nobbi, thanks for the detailed report. It sounds that despite an over-reaction by Canadian customs, and SQ's (or was it an airport policy?) no-batteries deal, which are both probably transients, things are beginning to settle down a bit.
I commend you on getting back in the saddle. Best of luck on your RTW. Keep us informed.