Does my Thai wife need to fill out a TM30 form for my NON O visa and residency certificate?

Why don't you apply for 1 year Non-O visa?

If you haven't already registered your marriage at your local Amphur.. then you will need to do this and obtain a Kor Ror 2 certificate.. which is needed to apply for your extension of stay.. you should also go to your Municipality and a apply for a Yellow book.. which is the foreigner equivalent of your wife's Blue book.. whilst it doesn't reflect ownership it serves as proof of address.. and removes the need to ever have to get a certificate of residence from immigration.. it can be used to open a bank account and apply for your driving license.. as well as just about every other business relationship (eg. mobile phone contract) or govt interactions.. and once you have that you can return to your Amphur and apply for the Pink ID card.. these will make your life so much easier!

As the property owner, she must file a TM30 report within 24 hours of your arrival. You will need a certificate of residency to open a bank account. My office in Nakhonsawan refuses to issue a CoR for bank accounts, but most offices will.

Never put anything in anyone else's name unless you want them to end up with it if things don't work out.

Were you married in Thailand because, if not, there are things you can do with your foreign marriage certificate before you travel to make getting your extension easier?

Yes to both, she can do the TM30 online