Philly was a MUCH better experience. I told him I had a connecting flight and he told me to have a seat. I figured I was in for another wait for hours and sat with my head in my hands. Then he called me up and handed me my passport and AP saying "You're good!"
I could have kissed him and I told him that!
I was in and out of there in less than 15 minutes and I made my connecting flight!
I have one more trip up to Canada with my AP before my interview...