Do I need to reapply for a NON-O visa after losing my passport with an extension based on marriage to a Thai wife?

Yep

Happened to me while I was home in Canada for a month - wet passport completely damaged

Got a new one using the expedited process

Visa/extension of stay/re entry permit all void.

Was able to get a new "sticker" for a new visa put into my passport from the Thai embassy (consulate?) in Toronto... Was able to sort it all out but a pretty expensive mistake!

One possibility, you go to the immigration office where your extension was issued with your new passport and letter from your embassy (if you get inside Thailand), detail information from when you applied for your extension to see if they can find the information and re-issue your stamp to your new passport. If you have the photo of stamps from your last extension, it would help a lot.

You may (or may not) need a police report of lost passport.

Yep, time to start again.