You did not say when you are leaving. If it is not for awhile I would suggest applying for a Nexus card and ensure it is set up to work with GOES in the US. We made it through customs, baggage re-check, and boarding in less than 30 min in CLT.