If you can make the change for free then do it. There is next to no chance of any luggage making the cnx and thus you will wait in YYC anyways or worse be on standby out of YVR having missed the ticketed connection. While obviously AC could not deliver bags to SQ in my case in 7 minutes there was another lady connecting from Ottawa or Montreal that had over an hour with no customs and the bags still missed.