What should I do about my expired work visa and extension in Thailand?

@[Von Paul]([members only])

My work visa expired March 31, however there were no news about visa amnesty those days. So, like any responsible foreigner I obtained an extension using the letter from the embassy. The Lamphun Immigration gave me until the 15th. I am so confused because if the rule says visa that had expired on March 26 onwards will get an automatic visa til the 30th of April then I should still be okay but will I still be covered with that amnesty now that I had used the visa consideration or I have to go back to Lamphun and get the other 15 days? I am currently now in Bangkok supposedly waiting for my flight on the 15th but that was cancelled. My other question is can I get the other 15 days in CW since I am waiting for the repatriation here and I don't want to miss that flight? The problem is if I am going back to Lamphun, I will surely be quarantined and I will not be able to be back here until May 1st. There are no commute available too going to Lamphun province. Please help. Thanks