Well, I have returned to Phuket with my new Non-Imm O-A that I got at the consulate in Los Angeles. All was good with the IO at the airport (I was very polite, spoke a bit of Thai). He took a picture with his phone of my visa and my TM 6, then I was on my way.
The only odd thing that happened was when I was checking in with China Eastern in LA. They asked to see my return ticket. "That is my return ticket" "Wait, you LIVE in Thailand?" Then, they asked to see some governmental ID, so I gave them my Thai driver's license. "That's a one-year visa", I added. She took my documents to her supervisor and when she came back, everything was good.