I feel the msq trials like steps and crystallis should be in there, primals and Mandervillian battles can remain their own thing. You would have much less groaning and insta dropping of things like steps of faith if it was in the main scenario roulette.