Can I switch to a Non-O visa from a tourist visa while in Thailand?

Hallo, looking for some advise.

Used to be in Thailand on a extension based on a Non-O Visa. The Non-O vias was issued by the Thai embassy in Switzerland. In March 2020, I got locked out of Thailand due to Covid after a short visit back home. Returned this year on a newly issued Non-O-A visa, as this was accepted before it was possible to return on the still valid extension.

I now would like to switch back to a Non-O-A visa. Know that this is not possible within Thailand so I will return to Switzerland before my Non-O-A visa runs out and will return two months later.

Now to my question.

I know that I could apply in Switzerland for a new Non-O visa as done before. But would it also be possible to return on just a tourist visa (or even visa exempt) and apply within Thailand for a Non-O visa? There are sufficient funds in a Thai bank to meet the financial requirements.