Whoa HC, everything you wrote, I could have written myself - including the exact same styles of music. And, my apc40 will be arriving in a few days as well
Here's another vote for Ableton Live (especially for breaks) Once you wrap your head around working in the session view, you'll never want to go back (and this is coming from a person who used Cubase for a very, very long time)