Go 2 July and bringing your yellow book/lease contract or other proofs of where your stay.
Then your can do the TM30 at the same time.
Take the resite/bookings from the hotel you stays in from 1-2 July, so if the hotel have been late to report ( some hotels whit few foreigners might only report once a week ) you will have proof that you stayed there.
Anyhow, it's the hotel that's responsible for the report.
Ask them to help you to register for online reporting for the next time....
it is also a rule that if you want to convert your current visa ( or permission to stay ) into a non-o visa, this has to be done 20 days ( Varies from office to office ) before your current permission ends..
Normally it can only be done from visa exemption, or tourist visa.
But has been some cases lately that immigrants has done it from other visas ( because of covid19 )
Usually you would have to travel outside Thailand for applie for it but they do make exemption.
Tod Daniels i wrote that earlier, that a non-o visa based on marrige or retierment is basicly the same visa ( but somehow the post was deleted, and he asked again)
I got mine in Bangkok ( 2012 ), whitch stated i was married.
But had to get a new one in Vitenna ( 2013, did not get my shit togheter for the extention in time)
that one didn't show anything about reson for the visa ( only Non-O )
But anyway, those i know who have changed reson for extention, has not done that the first time.
Some has got divorced, and then got a new extention based on beeing over 50.
And some has been married, and changed because of they don't need that much funds to stay.