What steps should I take to transfer my visa extension to a new passport while managing the 800k rule in Thailand?

i have a non-imm. type O one year extension of stay issued out of Bangkok expires October 9th. I have been out of the country for 5 months traveling and needed a new US passport with more pages. I also have the new 800k rules to deal with.

A few questions on next steps:

1. The Saigon Embassy only issues a letter with a lost passport. I will take the new and old passport with the Thailand non- imm. over 50 extension page and stamp to Bangkok CW Imm. Office on Tuesday. I assume I need to bring photos (?), copies of the photo and data passport pages and extension page of both new and old passports to have the extension transferred over to the new passport. I will not have a letter issued with the new passport. Is there anything else I need to be bring with me?

2. I am writing my Bangkok Hotel to make sure they are able to do an online tm30 in case I need that out at immigration ( and if not I still need a tm30 from here on at every new address for when I do my 1 yr. extension in a few months?).

3. I know I need to tranfer the 800k back into my Bangkok Bank account two months before I apply for the extension and then keep it there for three months additional under the new rules. I want to use transferwise or similar service and so I might not be able to document the 800k as an international transfer. But from what I remember the 800k needed for the extension does not have to have the international transfer documentation (only need that for the 65,000 per month method). Is that still the case under the new rules?

Thanks