Get rid of the two passive mults in the top row (+4HP). Passive mults as modules are a waste of space in a small build.
With your 16HP buy a Disting EX and an Ornament & Crime Micro.

It's two modules. But it's Christmas and your worth it. :)