Should I switch from a Non-B Visa to a Non-O Marriage Visa?

Are you married? Why do you think you can get a Non-O Multiple Entry marriage visa?

Or you can go for a multiple entree non o based on marriage, from savanakhet or hcmc. No proof of funds needed. However this visa requires you to exit and enter Thailand every 90 days

Your company? Not have 4 Thai staff as needed for the Work Permit. But okay, yes if you do not pay your Thai staff and yourself a salary, income tax and Social Security and does not have a yearly balance sheet from an accountant that shows your company make enough net profit to pay all this, there is no way you get an Extension of Stay.

Alternative is visit every 90 days an Thai consulate and apply for a new visa.

If you like to go the marriage with a Thai national route, you need for the Extension of Say or money in the bank, or income from abroad or income from your company with the surprise that you have to pay your Thai staff and yourself a salary, income tax and Social Security

You can keep your work permit with this type of visa and later the Extensions of Stay.