On your outbound trip, be sure that your checked-through luggage isn't put on the belt at YYZ for you to claim before you pass through the final stage of Canadian customs. Years ago I made this connection at YYZ many times... about half the time, my bag would put on the belt with everyone else's arriving from the US. The bags are supposed to be checked through, but don't count on it.