Opinions on this will vary, but I think Maths may not be what you want in a setup of this size, with so many big, modulation-hungry modules. I'd suggest replacing it with something like Quadrax or Zadar... more function generators, smaller footprint (but yes, some reduced flexibility in other ways). That would give you space for some other things... in a small setup like this, a Disting 4 would be a great Swiss Army knife, and you might find yourself also wanting a couple of basic utility modules (attenuverters, etc.).

Pam's is definitely worth keeping here, I think. It's just hard to beat the functionality per hp.