For the last 2 hp : I would get a precision adder like Joranalogue Add 2 or a sumtiple like LPZW WK1
Although, what I would actually do is throw away another one of the 2hp modules and get a switch. Like ST Modular Switched or Doepfer A-182-2.
Latest stuff : https://soundcloud.com/user-352590333