I'm going to assume you're not married to a Thai, 50 years of age or over, or have 500,000 baht burning a hole in your pocket. The covid extension is not a bad deal assuming it's continued past May (as it has been for months). However, if you want a little more security, then I think you are looking at an ED Visa. Discussion of that has already started here:
**************************************************************************************************************************************************************************************************************************************************************************************************
%2CO%2CP-R
**********
**********
*****
*****
*****
/permalink/
*****
*****
*****
6/?__cft__[0]=AZUewoqAf5FBjD5qHO2EqTwHqydS-cWT8WC6PwCckj-QvFhX-wyw3QhQBBC3tleiFXgDnQEmxzDxDyG9iZZN0Og0R6ndSQLAjZw3DnrH4IhOo_6x6s1zuCO4H2VIzzcSvZonMKaWVWIY1W08lAQP7goalDwyGIh5XuBwL1uHNAMjRcy_UdF_FlddiWCmuvejwXM&__tn__=%2CO%2CP-R