In my humble opinion, much better !
The Klavis Quadigy seems like an ideal choice for your rack, it's incredibly powerful and despite the existence of menus, the UI/UX design is great.
XAOC is also a great choice, and you might have gone for v1 in order to grab one in 2nd hand for cheap, but v2 seems like a great improvement, particularly the v/oct tracking with audio rates capabilities...
Finally, great utilities choie with the Quadratt and Noise Tools.

You seem set for a lot of sonic exploration, so ground control says "Good luck and Godspeed".

--- Voltage control all the things ---