Your easiest solution is to leave Thailand at the end of your current extension and re-enter then apply for a new Non-O with your 800k then the extension while ensuring you have the 12 monthly 65k transfers for your second extension
Yes you will need to border bounce as the only extensions that may be available to you is the 12 month extension with financial requirements or possibly the 60 day Visit Thai Family extension.