I used AXA when I came back last month. If you end up going with them, suggest contacting Arawan Namak on Facebook Messenger to serve as your AXA rep. She was always available to answer all of my questions when I couldn't get through to the AXA main office. Fortunately so far I haven't needed to use the policy so I can't speak to how well they cover hospitalization. They state that they cover asymptomatic cases, but Awaran stated they won't cover "close contact" cases (but I think none of the insurance companies will).
I have a similar situation as you. I am planning at 2-month trip to Europe starting in mid-July. I will have 7 months left on my Non O when I return and thought I would need to buy insurance to cover the entire period. If you're taking your trip before then, I'd be curious to know if you ended up having to buy insurance for the 4 months left on your Non O or if you only had to buy 30 days of insurance. A PM about that later would be greatly appreciated.
The Thailand Pass process was very easy in my case returning from Indonesia last month. Good luck.