Switching OA retirement extension to OA marriage extension

[RegularGuy]

I am currently on a OA retirement extension and just recently got married. At my next renewal, I would like to switch to an OA extension based on Marriage. My question is based on the new OA insurance requirements for retirement extensions and if the Hua Hin immigration is forcing OA marriage extensions to get insurance. My understanding was it was to be applied only to retirement extensions.
Has anyone here had recent experience in Hua Hin since the new order went into effect?

I am trying to avoid any surprises and want to know if I need to leave Thailand and re-enter using the Non O process to get a marriage visa. It will be an inconvenience and more costly if I need to go to this method.