@Dava *******
then please check back next March for the updated entry requirements to Thailand.
With COVID times all is subject to change.
You can enter Thailand either visa exempt or with tourist visa as you plan. With added opportunity to get a 60 days family visit extension of stay.
As you have had the Non O visa before you just need to ask your local immigration office what their requirements are at the time you are in Thailand.