What should I do if I may have been flagged by Thai immigration and need a new visa?

Visa advice

Hi everyone,

Need some advice.

My husband and I came to Thailand on visa exemption (UK passport) in march and we extended 30 days. During that time we decided to apply for Non O retirement visa in Laos. I couldn't apply as a dependent cos our marriage certificate is so old we needed to get it apostilled from SA - which takes months.

Long story short I went back in on visa exemption. My husband will get the retirement extension next week. I've had to leave because the marriage certificate is taking longer than expected and I am out of days.

I was planning to go back in on a single entry tourist visa. But when I exited (land crossing) the Thai immigration person was really aggressive and basically said that if I go back in I will be denied entry. I said I had no intention of not getting a visa. I feel like she has flagged my record.

So now what do I do?

Apply for the tourist visa and explain why I have been in the country and what I'm waiting for?

Wait it out here for the marriage certificate and apply for dependant visa outside thailand?

I did an AI prompt and was suggested that I get an immigration lawyer to check if I've been flagged.

Any helpful suggestions welcome.