May I recommend the Future Sound Systems OSC1 for your analog oscillator? I think that might float your techno boat.
https://www.modulargrid.net/e/future-sound-systems-osc1-cyclical-engine
Have fun and good luck!