I think what has happened is there is a "lost in translation" situation.
It is clear from the O/P's post that the immigration office thinks they want to go from a non-B visa to a Non-O visa.
First
@Fe**
, understand you are NOT here on a Non-B visa anymore, you are on a yearly extension based on employment.
AND
do do NOT need a Non-O to get a yearly extension based on marriage.
ALL you are doing is changing the REASON for your extension from one based on employment to one based on marriage.
Give it another shot, seeing as you're getting an extension based on marriage TAKE your thai wife with you if you can to help bridge the communication gap