If I have pension of more than $2K a month from USA, do I still need 800K Bath deposit?

Originating country for the 800k baht deposit for retirement visa. Does the originating country need to match your passport or can the money come in from any country so long as it is from overseas?

I extended my O-A for the first time based on the 65k baht/mo method in Dec 2020. The Jomtien processing agent grilled me for proof of a pension. I don't have one. I pay myself from savings. She couldn't understand that so went to her boss and came back with an approval and said nothing more. I used the same method in prep for next month's extension.

If I get grilled again I might convert to the 800k baht on deposit method though I don't like parking that much money here. So if I do what do I need to do for the Dec 2022 extension? Do I only need to have the 800k on deposit 2-3 months before then? Or do I need to do more than that and earlier than that for next year?