I do agree with Rob that leadership should stay, but I believe that implementing chance will only make most marshals forgo the Marshal Settings and rely on personal settings, since it'll be more reliable, thus we get back to the current system.
I think that having *more* control is the desired separator, but what constitutes more control is difficult to say, as on one end we have no marshal settings and on the other we have full customization of every type of unit and their settings.