I would get rid of the Mordax in favor of using the 16HP for other utility type modules. You already have two oscillators in the build (which is probably too much in a small build like this) and you have two other large modules in Maths and Morphagene. You could probably benefit from FX Aid XL (or just the regular FX Aid), Frap Tools 321, and maybe a small mix module as well. I would also recommend you consider a multifunctional module like ornament and crime and/or Disting EX...yes, you have to do some menu diving with those modules but in smaller setups like this its almost one of those 'trade-offs' that you have to consider to get as much functionality/HP as you can.
There are other awesome people on the forum who will be able to probably do better exact recommendations but as someone who has a couple smaller builds myself, those are things I would consider.
JB