Advice needed - when to get a new ED-Visa in the Covid-Crisis

Hello,

I'm on an education visa and plan to stay another year on a another education visa in Thailand.
My Visa runs out on the 25. May this year. (a little bit over 2 Months from now) I have to leave the country to get a new one.

Because of the current situation all around the World and in Thailand with the Covid-virus, I'm "thinking" about to get a new education visa right now and not to wait 2 Months before they will (probably?) close all borders and/or make more restrictions. I know nobody can predict the future where things are going in 2 Month. And my school said it's ok in 2 Month. But looking around the world should make everyone worry.

Of course, I will lose 2 Month of my current visa but I think my school is closing anyway in the next days or week and I have to learn from home.  

I'm thankful if someone could give me any advice. Would you wait 2 Month or would you get a new one now right now?

Thank you for your help.