A Non O visa based on marriage is issued if you are married. They don’t issue them because you could possibly get married to a Thai person in the future.
You are not on a Non B visa anymore. You are on an extension of stay based on working.
The date of your work permit is irrelevant. The day you stopped work is the day your reason to stay in Thailand stopped. You are on overstay since that day.