I would definitely wait till next month but in any case it's not a big deal... 90 euros for transportation from airport to hotel, three meals, one hotel night and one RT-PCR swab
A few days ago I stumbled on someone saying Axa was cr** for this reason. I also got mine through Arawan Namak, she advised ACS, good price and multi-entry, so I bought that one
I found this "AXA Sawasdee Thailand is a single trip policy insurance. AXA Thailand does not offer an annual "multiple-trip" policy at this time" (bottom of the page, just above section Remark)