It is pretty cumbersome to do things the old way now. The problem with just making it an out-of-combat setting is that then you lose the ability to change the flow during combat, which I think would be a bigger issue. Trying to add buttons and such to switch between 3 different combat flows...