Flying into Shanghai to catch a flight to Krabi

Hi: We plan to fly from YVR to Shanghai on November 1st. Then fly from Shanghai to Krabi, Thailand Because the flight from YVR arrives at 1610h and the flight to Krabi is at 1800h, we will likely need to stay 1 night. Do we qualify for the 24 hour Direct Transit Visa on the the way there?

On our way back from Krabi, we plan to catch the flight flight into Shanghai at 0600h on Saturday, November 10 and Fly back to YVR leaving on Sunday, November 11 at 1750h. Do we qualify for the 72h transit visa?

So can we get the 24 hour twov on the way there? And the 72 hour free transit on the way back? We are Canadian Citizens with Canadian Passports