From the sound examples you shared, I would recommend Plaits (or one of its clones) with the newest firmware for your second voice. I mostly use analog voices, but have come around to the versatility and charms of Plaits recently. The new FM mode and many of the older modes just sound great. Quadrax is cool, but suffers from some of the same problems as a lot of Mutable Instruments' stuff in that there are button combinations and mode switching and color combos that were hard for me to remember. If that doesn't bother you, Quadrax with the expander is powerful. I like WYSIWYG but that usually means more space/more modules/bigger rack.
The biggest question you should ask yourself as you are building a small rack is how much of a trade-off between knob-per-function and mode-switching/button combos are you willing to endure. If that seems like a headache, definitely plan for a bigger rack.
Have fun and good luck!