I was told to apply online 1 months prior to my departure date to Thailand. If denied, you just go on your US passport fort for 30 days. Can apply there for 30 days extension.
My wife had a similar situation. We both went visa exempt. She brought her expired visa, expired ID, marriage license, school transcript and birth certificate.
Took about five days. Very hair pulling experience.
I'm working on these things now. I am authenticating my marriage license and birth certificate and then applying for a spousal visa. I am married to a Thai women here in the USA and will be retiring soon. It is a bit confusing but reading these threads is helping me sort things out.