Our OP has good answers to his questions. Thanks
@Robert ******
.
Good luck...
IMHO...a simple border run or visit to Savannakhet is much better than switching from Marriage to Thai visa to an Ed visa.
The coronavirus issue the OP mentions in his wanting not to travel outside of Thailand is of little risk.
The virus does travel across borders and sadly is already in Thailand.
Commenting closed.