a few quick follow ups:
-- my longer post yesterday was more along the lines of "cool ideas & prior posts for you to investigate" plus some module types you don't already have, if you wanted to consider a larger and spendier but more capable rig
-- I agree with Ronin and Jim above, it's a great idea to figure out # of voices you'll want from your rig at any one time, and what would be required to support those. If you wanted all your voices out of modular, as Ronin said, that's likely a bigger and more expensive rig
-- the practical, near-term edits I would suggest to your rig above are i) bigger case ii) add Ochd (for more LFOs), Gx (for more lanes from Metropolix), and SISM (for CV control). But it does make sense to go through the exercise Ronin mentioned first, before you commit to any additional modules and HP.
... thought I'd follow up with something more focused and practical (as my earlier post was not as near-term & practical)
Good luck, enjoy!