No you need to book seperate thai if availing government facility seperate and non thai seperate but if you book ASQ for all you can stay together and some hotels giving discount to thai nationals
I am out of thailand had my extension to be collected on 30 th april but couldnt collect it asked the thai embassy got the mail advice to ask immigration and when my friend asked them they told him to ask ministry no one had any idea both didnt knew anything.Ultimately asked my ministry of external affairs to intervene they could only get the reply through our high commissioner in bangkok from ministry as well as immigration such is the sorry state of affairs in thailand.
I am holding a NON B Business had similar issue as my extension was expiring on 30th April and recieved it on 16th april as flights not available and amnesty till July.I took it up with thai embassy in delhi who advised me to speak to korat immigration my friend went there and spoke to the head he told us to apply for a new one as amnesty covers only those inside thailand.Then I took it up with MOS external affairs who directed Mrs.Durai the indian ambassador to update me she got the same reply I need to apply for fresh NON B and promised me to help in any other issue. Even korat immigration officers also tried to check in their rule books but nothing so as your case is similar one you need to apply again and contacting thai embassy here in delhi is a waste.
You need to go immigration office and apply for the renewal of old visa they will stamp extension visa under consideration of 30 days since it is 23 may u need to act now and whenis your work permit expiring in my opinion you should meet immigration people immediately.
First you need to choose your visa type as you want to stay for a long time air travel will not be the same and secondly there will be lot of rules and tricky one is have a insurance covering covid amount unable to recall and a last piece brotherly advice stay home.