have you thought about patching a complex oscillator with the modules you'e already got... it'll probably get you a more distinctive and different sound than buying an off the shelf one... I'd do some research on this and play around with them, at the very least it will help you narrow down what you want from a complex oscillator, in terms of the built in functionality - wavefiolder, fm, am, pm etc....
"some of the best base-level info to remember can be found in Jim's sigfile" @Lugia
Utility modules are the dull polish that makes the shiny modules actually shine!!!
sound sources < sound modifiers < modulation sources < utilities