I did look into both these Elektron machines indeed, but it was the combination of a non-sampler basis with the possibilities to do samples that appealed to me. It is also my first drummachine so that would give me an insight into what works for me.
I will look into the Roland TR8S.
The sound we are going for is heavily influenced by EBM. The more oldschool acts like D.A.F. but also newer acts like Phase Fatale. That last artist explains his gear in this video How To Make A Track: Phase Fatale - YouTube and the Machinedrum that he uses here really struck with me.