IMO I think you need something to make a bass base and some drums. A module I see in almost every Techno oriented rack is BIAS, very versatile as it can give you all kinds of aggressive percussion and bass lines. It incorporates its own envelope.
https://www.modulargrid.net/e/noise-engineering-basimilus-iteritas-alter-black. What I will say is not going to be very popular, but due to the size of the case you have, I would change the MOSKWA for a NE Mimetic https://www.modulargrid.net/e/noise-engineering-mimetic-digitalis-black, half of size, 4 CV outputs. And with the space freed up, I would add either a small VCO feeding one of the Percall inputs for a bass base, thus freeing up the BIA for percussion, or a percussion module with CV control, for example https://www. modulargrid.net/e/befaco-kickall
(reduced size)
or https://www.modulargrid.net/e/patching-panda-bd-z
BR