Immigration just want you to have a visa suitable for your purpose of stay. You are not a tourist anymore. FFS you have a Thai driver's licence! Have a spouse? Get a Non O Spouse. It isn't rocket surgery....
Thailand is what Thailand is. The things you usually come for are all still here. Some minor restrictions are not going to spoil your fun too much.....unless you test positive and don't have the right insurance....then it's a bitch.