Did all that in BKK just in case there was a problem (embassy etc close by). The translator we used helped us out with the marriage for a few extra bucks. Hassle free. But I get that this is not a great option atm. Local Amphur can do it but sometimes a bit more mucking around. You have what you need but I would get the divorce papers done to be sure.
Good luck with it all and congrats on getting married.
and your case I wouldn't argue about. I get it. I just see so many people trying to work out "which visa will work for me" just to get there. It perplexes me at the moment.