If you get married before last extension goes out, you can apply a new extension based on being married to Thai that gives you another 60 days. Then you can change your visa to non-o u sure if you can get 1 year on top of that but if not then just go Laos and apply non-o