@Nann ***********
, just so you're clear First off you are NOT on a Non-B visa, you are on an extension of stay and you are NOT switching to a Non-O visa either.
You are changing the reason for your extension to one based on employment to one based on marriage, That's it.
You are not switching visa types.. <- because you're NOT on any visa here at all you're on an extension <- which is not a visa ;)