From Canada here too,,,we are going in July for 1st time.
Just an option if you can,,,if booking points see if your room is still available for your check out day. Book it,, and then you have your room right till you leave. For us it is worth it for those extra 8 hours of chilling, last minute showers and wash up or laundry. Now if you switch categories, its not worth it since you have to check out at 11am,,and no guarantee to have new room ready for 4pm or earlier. So if doing so book same cat room and just link the reservations.