Why not train your wizard to cast fireball on command spell!
Two fireball in one round, no problem, the Cleric command it's Wizard to fireball, then the Wizrd refireball later in the round.
I would 100% let "Revert" work as a command. Anything to discourage the PCs from constantly using Command "Masturbate" will be a blessing.
If your DM decides "revert" is too ambiguous a verb, both "Shapeshift" and "Wildshape" are used as verbs in D&D with regularity. Given the druid is already in one form and their only option to "shapeshift" from animal form is to turn back into themselves, then yes, they should...provided they fail their save.
...is that a common thing at your table?