So, you win.
I took your patch and tweaked it a bit - and i have a pad that I absolutely love! Totally what I was after all this time!
Mainly I changed F2 to peak and modulated the cutoff, added some other modulations like panning and PWM, added a bit more vibrato with an envelope on the depth, then finally added chorus and more verb/delay.
I am beyond happy with it. You have made me love my synth again!