Yeah, losing the CMP-1 isn't that big a deal, I shouldn't think. That's one of those functions which, unless you're building a cab for drum modules, just doesn't click in all that well. May as well lose the Braids, since it's out of production and having two NW1s is going to be pretty killer, source-wise. As for additions, maybe consider one or two oscillators that can do double duty as LFOs for some extra modulation sources...always useful with wavetable souces. A couple more AD-type envelopes that can also loop would be useful too, I think, and maybe a couple more linear VCAs for modulation CV control...but that's not all that much, change-wise. This is going to sound quite cool, indeed...the architecture is not too dissimilar to a Blofeld, but in mono mode!