What steps should I take for visa and property registration as an Australian married to a Thai national in Chiang Mai?

Hi Robert and members. Since joining a couple of weeks ago, I have been trying to get my head around things. Maybe my scenario could help others.

I am Australian and married to Thai. We bought a house, in her name just out of Chiang Mai, back in April. I still work in Australia and come over on a Visa Exempt on arrival. Last week I did my first ever border crossing at Mae Sai to get another 30day Visa on Arrival.

Now with investigation I realise I need a TM30 and my wife needs to register the house with immigration?

Should I do anything about that now? I have been puting the address on my immigration entry forms.

I will go back to Australia in Feb. I will need to get a new Passport before my next trip to Thailand.

So should this be my procedure?

Apply for Non-immigrant Visa in Aust.

When I arrive in Thailand, change it to Marriage Visa.

Should I wait until my next trip to do TM30? Maybe register the house whilst I am back in Australia?

Thanks.