If you’re asking because you are worried about blowing your vacation do what I did. I isolated before I flew. If it’s a return to your home here in Thailand you would fly anyway right?
Have used hotels for apartment rentals (Samkong Place for example). You can always ask if you are concerned but I had no problem. Good on you being proactive.
If you apply for a new one and don’t get it in time you can still use old one. And since you’re planning to fly anyway and the Thailand Pass is free to apply and you already have all the info why would you not apply again?