You can translate your documents and stamp them in ministry of foreign affairs in laksi if you brought your marriage certificate, then bring them to amphur to get Thai marriage certificate from there you can convert your visa to non-o since married to Thai
Would recommend contact UK embassy in Bangkok to get confirmation
All up to the immigration officer in front of you, if he or she is having a bad hair day. With all this travel history I would start looking into a proper visa since from a officer view looks like you either working here or trying to abusing the extempt law.