If you have the resources, I would recommend applying for the DTV from a nearby country ASAP. The visa is still somewhat new but the requirements may change over time and become more strict.
The ask:thailand community, consisting of multiple Q/A groups with over 100,000 members, powers this platform. It is not an official government resource. Our members actively contribute to this resource, and while we strive for accuracy, we cannot guarantee its complete reliability. Assistance to travelers is provided as a community service.