@Colin ********
There is the new "Destination Thailand" Visa, DTV. It is 5 years valid, but requires some proof of funds. I think about 20,000EURO - google it.
It has basically two categories, one is "digital nomad", aka working remotely in Thailand, the other one is "sport and cultural activities".
My Scuba diving would fall into the second one.