I'll second @JimHowell1970 on the A-118, I have one and like it but Kinks can cover random for you and it's got some nice extra functionality packed in. Agreed as well that the FX Aid is great.
Drums wise, take a look at the HexInverter "Mutant" series. The Mutant Hi-Hats is just fantastic and will have a lot more range than the TipTop clones, plus you can put all that modulation to use on it. 13HP is a lot in a case this size, but it's worth it if you're going to do drums in the rack, imho.
my tunes: https://stevehand.bandcamp.com/