You need a non-o visa based upon marriage or non-b visa to apply for the one year extension of stay based upon marriage or working (non-b) for a company.
You can get a work permit with a non-o visa and a extension based upon marriage. The 40k baht income is for a extension based upon marriage.
You can apply for either visa at immigration with the correct supporting documents.
It will not easy to apply for a work permit with visa exempt entry.