I received a non-OA retirement visa from the Thai embassy in the U.S. in 2019 before health insurance was required. Then in 2020 when that was expiring I applied at Phuket Immigration for a 12 month marriage based extension. We were interviewed. The application and supporting documents were reviewed. Everything went fine. I was given provisional acceptance and told to return in 30 days to pick up my visa. The next day the immigration officer called my wife and said "Sorry. The rules changed. We cannot give you the marriage visa extension". Instead, they gave me 30 days and told me to apply for a Covid extension after that. I didn't have 800k in the bank for a retirement visa, so I went to a visa agent, and he got a marriage based extension for me.
It's time for me to renew again. I plan to apply without using an agent, but I'm not sure which rules apply in my case regarding the health insurance requirement. Do the non-OA health insurance requirements apply since my original visa is non-OA, or since I currently have a marriage based extension am I exempt from the health insurance requirement?