Okay, hang about and take a deep breath :O
@And****
you got a 30 day extension because you just recently entered the country and that's the "regular" extension you get FIRST.
BUT
That's fine, and you probably can do this all without even screwing around with the 60 day visit family OR the 60 day covid extension.
Get your marriage registered at the Amphur then you and your thai wife go to Chaengwattana and talk to the people in Section C-1 (they issue in country Non-Immigrant Type visas) and get the hand out listing the requirements.
You need at least 15 days on your current stamp to apply for a Non-Immigrant visa in that section (because it goes under consideration for 14 days before you go back and get the Non-O visa and a new 90 day stamp.
IF you can get your shit together fast enough and get the marriage registered, you should be able to pull off applying for the 90 day Non-O visa without needing any other extension.