Should I Hire an Agent for My Non-B Visa Extension or Wait?

Hello, I would like a little advice on my situation please. I am currently on Koh Phangan where there is no immigration office and of course it is ill-advised to travel to the nearest one on Koh Samui. I have a Non B which I must extend outside the country every 90 days.

I received the 15 day covid request for extension right before the amnesty was passed. At the time I was told to return to immigration on the 23rd to receive and additional 15 days.

I am wondering if it is in my best interest to hire an agent that travels to Samui to extend for me on the 23rd, which would give me until May 6 to exit the country. Or could I save myself the expense and wait as everyone is doing until April 30th to see what the next possibility is (perhaps extended amnesty if we are still locked down?)

Thank you for your thoughts.