To change to a non-o visa you would have to leave and re-enter the country. Immigration does not issue visas unless you entered visa exempt or with a tourist visa.
You could change the reason for your extension of stay from working to a extension based upon marriage to a Thai.
You will need 400K baht for 2 months or proof of 40k baht monthly income to apply.