at the moment without doing the quarantine it's difficult. Under normal circumstances you either have to leave and come back in as a tourist either a visa or 30 day exempt for them to be able to do the Non O inside the country or obtain a Non O from an overseas consulate.
I think you would have to look into the law regarding hiring foreigners. I am sure for every foreigner hired a company has to hire maybe 10 Thais to compensate. I am not sure of the number exactly.
apply about two weeks before the 30th March and you will get another two months. Mine expired today but applied two weeks ago and got until 30th March. Wait for it to be officially confirmed.