You have to wait and see, when the new rules will start, nobody know yet.
thailand.prd.go.th/en/content/category/detail/id/48/iid/
*****
0?
The only way to be sure, is to get a 60 day touristvisa, it only cost you around 1300 baht, and then you can stay up 90 days ( by doing a extension ) without having to leave Thailand.