What Are My Options for a Non O Visa Based on Marriage in Thailand?

Trying to figure out my options. I was originally going to go to Savannaket, Laos to get the 1 year multi-entry Non O visa based on marriage but I obviously cannot do that at this time. I entered Thailand on January 13 2020 on a tourist visa and extended that 1 time. After that expired I got the 60 stamp to visit thai family based on marriage. My current stamp expires May 5th and I was planning on getting the 90 Non O visa based on marriage. I know that I have to show 400,000 baht (coming in from overseas) . I had a couple of questions regarding the process. If I transfer 400,000 I basically cannot use any of the money for living expenses until I get the 1 year extension of stay stamp? Also if I get the 90 day stamp and then subsequently am able to go to Savannaket would that make sense to do or should I just continue with the process in country? My immigration office is Sisaket.