It seems like you are all set. Just make sure that if you have been vaccinated, carry your certificates, a quarantine plan, and and PoF and your documents.
If you are crossing the border by land, in your own vehicle, i.e. not commercial, you do not need a visa. However, if you decide to fly or catch a bus, you will have to show the visa.
I feel you are all good to go. On the day you decide to cross, give a call to the CBSA PoE office, and ask the name and badge number of the officer, just in case.