Honestly that sounds like a really smart and reasonable approach, and so far it sounds like you're making good decisions. Selling modules that aren't working out or that are taking up too much space can be a good idea sometimes, but I took another crack at this assuming you kept everything you have right now:

ModularGrid Rack

Basically, I've swapped one of the LPGs from your planned build for a Disting and a 4HP VCO by Doepfer (that can also function as an LFO). Ultimately there's no right or wrong in modular, but the Disting does a ton and can really help you figure out the direction you want to go with your modular. Want to make generative? It's a quantizer. Want an interesting voice? It has tons of VCO algorithms. Want to play samples? It does that too. Want to record on the fly? Yep, it's got a recording mode.

Anyway, hopefully this has been some useful perspective, and looking forward to hearing some of your tunes!