That's quite a haul in 24 hours! Since I live close to the southern border I think I would go south to north from Nogales to where you went in Canada. Then maybe take several days to get back home.

Did you have any issues at either border? I'm not thrilled about the idea of taking my bike into Mexico and back.