Thanks. Looks like I'll book it as a 23 hour connection.
For future reference, if for some reason luggage is not short checked, does it come out in a location where you MUST take it through US preclearance and MUST check it through to the US? Or after going through preclearance, can one always change one's mind and go "back to Canada" before checking in?
Yonatan