Your current choices aren't bad. You just don't have a lot of options. A filter, maybe an LFO might give you a bit more range.
I would wait until Behringer drops their 808 into production before shopping for a drum machine. The 808 will probably be pretty hot and come in around $400. I can see Moog discounting the DFAM to compete.
As far as sequencers, check out the Eloquencer and then the 1010 Music Toolbox. If you're coming from the world of DAW, the Toolbox is an easy transition to make and it's very flexible with 8 Gate and 8 CV or Gate outputs. It does a variety of LFOs and can even sample two channels of external CV. I bought one and I really like it. It serves as the hub of my set-up now. I'm not saying it's right for you, but to check it out to see if it is.
How do you intend on triggering your drum machine? How many gates/triggers would you be feeding it or do you want one with an internal sequencer you can just sync? That should throw into your sequencer selection. You may even have/need a second sequencer for your percussion.