I take it you're not eligible for Nexus or GE? If you are and have time/inclination, it'd be well worth it.
Had a shortened int'l=>domestic at T3 last year. Made it with a lot of time (though the connection was delayed too), and wouldn't have been too difficult or much longer even if we had been connecting to the U.S.