I don't think either of these systems really do the trick, especially the second (that one has only a single drum voice, nothing else, which isn't in line with your stated goals).
For the first system: yes Maths is great and does lots of stuff, but in a 62-hp system, it takes up too much space. And the NE distortion module is fine, but it does only one thing. I'd consider removing these two modules and replacing them with something like the following: XAOC Zadar, a Noise Engineering Versio module, and whatever 4-hp module you think might be useful (the Q-Bit Nano-Rand might be fun, since you have no random source or S+H here). That'll cost you a little more, but it will pack a much greater wallop.
A much better idea though would be to move up to the 104hp version of this same case, and fill in the space you don't want to fill immediately with some blank panels (you can even make them out of cardboard). You're going to want the space eventually.