@Ryan *******
in that case (seeing as you already have your 30 day extension) slog on over to your immigration office before the 25th and see if you can apply for the covid extension.
AND when you're there ask them if when you apply the 60 days will start the day you apply or if it will be added to your current stamp expiration date (april 24th).
If they say you can't get it, then you need to make a plan be to exit on or by the 24th of April