What about a play through house rule that prevents leaders from being moved to other units. It would eliminate the need for the extensive hero management that is such a time sink and ruins the flow of game play. This might might also be included as a negative commander trait worth a couple points. ...