Read what others have said about trying to do it in analogue modular Vs digital when you’re aiming to emulate a digital synth.
But anyway, if you’re up for multi operator analogue modular FM (which I am and is cool ) you should check out the nonlinear circuits FM op and valmorification modules for osc and envelope as this is what they were designed for. Tricky DIY build if you’re up for it, of you can buy built.