YES, to the best of my knowledge and in Hua Hin in the last two successive years i've used BOTH different methods. Unless something has changed. Certainly for ther monthly income needs the proof, many have posted in the past no need for the lump sums to have come from abroad (although mine did)
I changed to extension based on marriage with the 40k monthly option after many years of retirement extension in Dec 2019 at Hua Hin. No problem. Changed back again December 2020 Hua Hin, no problem although initially downstairs wanted evidence i had 400k in bank three months after last extension--but not applicable. I didn't mention it upstairs, nor did they. I had earlier in Bluport been advised (when i checked about this conversion) to get the certificate of still being married at the Ampur. (Presumably as a divorce could be a reason for changing to retirement)