@Kate ************
you SHOULD NOT go off from your non-O visa based on marriage to get a Non-B. A One year extension of stay based on marriage to a Thai allows employment.
However you should go to the immigration office and talk to them about getting either a Thai Passport/ citizenship or PR. A female foreigner married to a Thai does not have to meet any financial requirements for PR/ Citizenship