Something I just thought of in this situation. Not sure if you plan on bringing back anything, but beware you can only claim your $800 per person exemption once every 30 days. So, I'm not sure how declaring anything you have in CLT would impact your arriving again in the US on your way home after leaving YYZ.