So this is what I am planning to do now.
June 21 fly from YYZ - YOW
June 23 take the VIA from Ottawa to Montreal.
June 26 fly from YUL to YYZ to connect to my YVR flight the day or two later.
My main concern would be the train as I am not sure if that would be allowed to cross the 'border' into Quebec.
I might have to wait until June 16th to get clarity but wonder if anyone here has done something similar recently.