@Dee ********
that's a decision you have to make.
I don't think you have enough time to get married on this current 30 day embassy request extension and then apply for the in country 90 day Non-O visa (although that's a decision you need to make AFTER talking to the immigration office to find out how many days you need left on the stamp to apply for the visa)
That means your options are:
get married, apply for a 60 day visit thai family extension, use that time to apply for a 90 day Non-O visa, then apply for the year
OR
get the 90 day medical extension, get married, apply for the 90 day Non-O then apply for the year.