You don't need to file the TM30 on your return, the responsibility lies with the hotel or the owner of the property you're staying at. Also I've never needed a TM30 for a 90 days report!
The only border crossing that I know of that requires you to stay 1 night is the Poipet crossing in Cambodia and that's only if you don't use an agency. Crossing at any Thai/Laos border doesn't require an overnight stay.
Get the Non Imm O based on marriage in the US and then when you have 30 days left on that apply for the 1 year extention of stay based on marriage. Job done!