The only benefits of the marriage visa is a smaller financial requirement and the ability to get a work permit. If neither are of interest stay on the retirement visa.
Just because you are a Thai tax resident it doesn’t follow that you need a TIN or to file a tax return. It just means you now come under the Thai tax jurisdiction.