@Tod ********
-- In my experience, the
****least hassle*** is just as I suggested.
- Obtain a Multiple Re-Entry Permit-
-- Especially with the additional paperwork and timing required with the current pandemic entry.
+++ 30 days is tight to work any new Visa.
The OP currently has an O-A.
There are several options.
Are we only presenting some?
Or should we present all and let the OP decide?