What is the best way to transition from an STV visa to a Marriage visa while in Thailand?

I made a post before asking why you thought that people were getting stopped at the airport.

I'll let you know my situation.

I've been coming to Thailand and returning back to Australia and sometime with my girlfriend (now my wife) for the last 6 years.

In June 2020 my wife and I had our wedding in Thailand planned but when I arrived in Australia early Jan 2020 Covid hit and I couldn't get back to Thailand until March last year. 2021

I arrived on a STV Visa because that gave me 9 months in Thailand to get married and set up our home. My STV visa ran out in December and I've received 2 Covid extension since then.

(I understood the STV when I took it on and understood that I would have to leave the country and return.)

Now that my wife are legally married in Thailand I wish to leave and return on a Marriage visa.

I was thinking about doing this in Cambodia because my wife and I can visit friends there and have a holiday while we get the visa sorted.

I don't want to bleed the extension thing and I understand a reply to my last post that its best to return to Thailand on the right visa for your stay.

But with the marriage visa I can also do this in Thailand while I'm on a Tourist visa.

We have every bit of evidence of our history, marriage paperwork, seasonal money, ID cards what ever they need.

I'm trying to find out what is the best option.

Travel to Cambodia apply for marriage visa and return to Thailand on the right visa for my intention or go to Cambodia and return on a Tourist visa and hopefully not get denied entry and then sort out my marriage visa.