I went with a Rubicon II as well. What ultimately sold me on the Rubicon is that it can function as an LFO as well. I was thinking about all of the crazy waveshapes I could generate then push them into a quantizer or controlling a filter cut-off. I went with a Tip Top Z3000 mkII rather than the Dixie II. In retrospect I might have been happier with the Dixie since it has a switch for controlling the range rather than sweeping through the entire frequency spectrum for dropping/raising the oscillator an octave.
I didn't see the Dixie in your set-up, though.
If you're looking to nick $1000 out of the set-up, how integral are the MakeNoise modules for your initial set-up? You're going to get a wide range of sounds out of the Rubicon.