Do I need to provide a TM30 when extending my SETV in Thailand?

I am looking into doing my first ever TM30 reporting saga (Registration web site detailed by Todd in another post appears to be down)

I am awaiting my Thai Elite application to be verified so going forward I think it would be best for me to report using the online system (My landlord is completely unreliable) as I am an Oil and Gas Worker who travels regularly.

In the meantime, I am here on a SETV which I plan to extend next week well in advance of the end of the 60 days validity (August 25th). I read a post here that the TM7 form has been updated so expect I will have to fill that out again at Chaeng Wattana but I was wondering if I am likely to be asked for TM30 when I apply to extend my SETV?

Should I try to self file and bring it with me using Todds self reporting with no Landlord documents?

Thanks in advance as usual