So basically to stay 7 days past current date on stamp in passport and go straight to japan from here when it reopens next month it would seem necessary to basically visit the Thai immigration office on the last day or day before the last day of the Thai visa exemption stamp validity. That doesn't seem advisable.