Can I convert my Non-Imm B visa to a Guardian visa without leaving Thailand?

I entered Thailand on a non-IMM B (work visa) in November 2019, teaching at an International School. My visa and WP expired on June 16, 2020.

I had planned to return to the US before the expiration and return for the new school year on a Guardian Visa. (my kids are enrolled at an international school, and I'm following one of them)

Their student visas were successfully extended until June 2021.

My summer flight was cancelled, so I've been here since June on amnesty.

I was just able to transfer the required 500,000 baht to my Thai Bank account. As in it literally just hit my account today, July 15th.

#1 - Should I be able to convert from my non imm-b to a guardian visa without having to leave the country?

#2 - Due to the circumstances, do think there is any leniency with the requirement to have the 500,000 baht for 30 days? (It was suggested to me that maybe I just overstay the amnesty by 2 weeks to hit the 30 day mark, but I'm not overly comfortable with this.)

Any advice is appreciated!