Doepfer

top of my list is the wasp filter. it's got the three filter shapes you need, plus it distorts excellently with audio sources when you want that.

(the distortion module is great for oscillators that have a consistent output level, thus allowing small doses of distortion when needed, but you might find it too in-your-face-all-the-time for audio. at least, i did.)

second on my list is a ring modulator, especially for my tr606, which could use some more modern sounds. klangs and donks, no problem!