You can apply for an extension of your visa exemption. Most immigrations accept extension 30 days before your current stay expires, some as Jomtien and Samui only within the last week. Bangkok and Chiang Mai accept 45 days before.
Up to the IO you’re standing in front of as Phil said, but you could easily cover your stay without any risk with a six months multiple entries turist visa applied for online through the Thai embassy that serves your area before you leave.
Still 60 days and that’s all anyone knows. If it get turned back to 30 days at some point in the future you still can apply for a 30 days local extension.
You don’t need to prove your adresse, just upload a document that indicates current location and it could be your drivers licence, utility bill, bank statement with name and address etc.
If you pay an agent to help you with opening a bank account - which agents still legally can do - your visa/extension will not automatically be invalidated for that reason.
I guess it still might take some time but at least at several embassies it’s possible to apply for a Non O visiting Thai family based on being married to a Thai national of same sex.
There will not be a separate law that equalizes same-sex marriages also in relation to visas and residence permits, beyond the law that already passed in January this year.