Think about MI grids for triggering your drums and something more dedicated to pitch sequencing. Perhaps a Rene for more happy accidents or Q-bit Octone for a more standard approach to melody. Another option would be Pam's and O+C that would get you into a Rene type sequencing. I only mention these because there in a lot of peoples racks.

Your lacking envelopes. I would get a least one standard ADSR envelope this being its only function.

Stages with only six steps it a really expensive envelope generator. Any other functions Stages does with only six steps it does poorly. If you double up on anything get two of those.
Happy rack obsessing