If I may make a suggestion, don't go straight for a new oscillator filled with complex options and a billion possibilities. It's easy to get lost there and ultimately (I'm speaking from my own experience anyway, so maybe I'm totally off and very biased here) you'd rather get an oscillator to which you can add things rather than try to take them off. It's very tempting but after beginning with two oscillators with strong personalities and lots of options I was very happy to get one that can create simple waveforms that would complete and add something to the complex ones from my other oscillators. You can get such oscillators for cheap, add an extra filter there, a VCA, and you're almost set.