For the style of music you are interested in, I would HIGHLY recommend getting the Behringer RD8 (or maybe waiting for the RD9) for your drum voices. I have both the Blck_Noir and the RD8, and the Blck_Noir has a gritty character that is more in line with late 70s/early 80s post-punk than techno. I'm a big fan of that whole Detroit scene, and the RD8 has Drexciya written all over it (much cheaper and more fun too!). They're both cool, but I've mentioned in this forum before that I never feel like I get exactly what I want out of the Blck_Noir. The RD8 also has a few trigger outs and a clock input so you can integrate it well with your modular.
Just my two cents after a quick glance at your rack. I'll take a closer look after the holidays.
Have fun and good luck!