If you own the property, why not do TM30 online anytime you want?
TM30 is supposed to be submitted within 24 hours from arrival to that address, NOT Thailand. And no problem you re-submitted again. The latest dated report is the one active and valid.
Submit before you go to apply for your visa/extension and the get a receipt. Then you would be fine.
*******************************