What are the requirements for reapplying for an Extension Based on Marriage or Retirement in Thailand?

Hi. I have a two-part question I hope you can help me with.

Background:

1. I am a Canadian and married to a Thai and living 6 mos and 6 mos in Canada and Udon Thani in our house as well as travelling around SE Asia. We are planning on living here full-time starting in the Fall of 2023.

1. On Nov. 4, 2021, I entered Thailand on a non-0 Visa and on December 2021, I applied for and got the 1 year Extension Based on Marriage; this extension expires on. Feb. 1, 2023.

1. My wife and I flew to Canada on March 30, 2022 and returned to Udon on October 7, 2022 and duly reported to the Udon IO.

1. The Udon IO advised that I must report in 90 days on Jan. 7, 2023 to maintain my current status or IF I want to reapply for a new Extension Based on Marriage then I can reapply anytime between Dec. 25, 2022 and Jan. 7, 2023.

My Two Questions:

1. If I simply reapply for an Extension Based on Marriage would I just submit the TM7 with appropriate documents or must I include with it the TM30 for my 90 day report?

1. Currently I have 400,000 baht in my bank account. My wife has suggested that she deposit another 400,000 baht in my account so that I could simply apply for the Extension Based on Retirement as there is less paperwork involved and no need to bother our neighbor witnesses. Can I do this and given the above dates what would I need to do and what paperwork would then be required?

Thank you very much for help and assistance.