Apply for your O visa now and it will allow you 3 months grace to to enter Thailand. Once your details are in the system you will get a COE much quicker usually 2 days saves a lot of time and stress.
Being saying that for 18 months when will people understand that it will be year's before normal times are back. I am going next week I need to see family ๐