Just a quick update:
Thanks to advice I received here, I decided to:
- FINALLY submit my PR application, (inland, spousal sponsorship) along with the OWP application
- Apply to renew my NAFTA permit online (instead of in-person at the border).
I did this all before my old NAFTA permit expired...