@Brandon ***********
Sorry I worded it poorly. I got my non-B visa several years ago. What I have is the yearly extension. I’ve been here for about 15 years, started with an education visa for university and have been on work visas after graduating.
The reason for changing is my current company is having issues with the building landlord and I don’t know how that can affect my visa status if we effectively get kicked out of the building and are scrambling to find a new building to continue business. I would rather my visa be attached to my marriage so my stay is not at the mercy of my employer.
In scenario 2 where I just wait until this current visa extension ends, I guess that doesn’t usually involve having to leave the country?