I think Order B would serve the main Labyrinth of Evil cut the best with its stated intentions.
If you’re willing to make major changes to your hypothetical conservative cut that keeps Padme’s death, I’d revert entirely back to the theatrical sequence aside from sticking “Yoda, Mace, and Obi-Wan discuss their misgivings about Palpatine” before Grievous lands on Utapau and Bail’s apartment scene in the same place it is in LOE.