I think that is your best option in your situation , next year (April 2025) perhaps apply for your 12 month extension as early as possible to see how it goes , In Phuket i always apply 45 days before , not sure if Bangkok is 45 days or 30 days , but i hope your 2025 extension goes through doing on your own.I myself thought about using an agent recently over the last 2 or 3 years (16,000} , then sending my 800,000 back to the UK and get 5% interest on it in a UK bank (40,000). Now , though i have started instead transferring 65,000 internationally through Wise to my Bangkok bank , when i renew my extension next February , i will do on the income method , then when everything is complete , i will transfer out my 800,000 and put it in a UK fixed interest account , rather than have it sat earning 1.0% in a Krungsri Mai Thai Dee account (8000 - 15% tax , 6,800 per year)