Sounds like a good group. With that many things going on, something like an Ochd+expander would perhaps be helpful, but that's not necessarily obscure and you may very well have considered it already. That's the nice thing about expanding from semi-modulars: they already work, so extending them doesn't really have any requirements as long as you know what you want to do with the other parts.