I agree with
@Robert ******
, just one thing before the visa expires you apply for a visa extension based on marriage, from your local immigration office, this requires more admin, like financial proof etc, give yourself time to understand the requirement, so it goes smoothly. I visited my office with my Thai wife which helped a lot, as each office can have a different view of what's needed.