@Jona****
, okay your permanent resident hopes will have to wait a good while and it's NOT visa related at all, so let's just forget talkin' about that now. :/
You asked about a Non-O VISA based on marriage. You didn't ask about extensions. but if you get at least 40K baht every month from your country just get an in country yearly extension.
If you don't you can get a year-long, multi-entry Non-O visa based on marriage to a thai at the consulates in Savannakhet Lao or Ho Chi Minh City Vietnam <- neither of them require proof of funds to issue the visa.