Bangkok is not strict, i have been coming 2 weeks every month since october last year and for 5 years prior to covid and never been stopped. Maybe just lucky,
I now have the OX visa issued in late May because was easier to get my thai id and renew my bike and car license as they expired while stuck in Australia
I didnt answer that as you said your leaving. And when the covid extension stops it will not matter as 60 days will not be available to get first or 2nd anyway