Reply to Novation Twitch or Akai APC40?

I used to mess about with digital DJing but drifted more into production. I create tracks mainly using Reason 7 rewired into Ableton 9 to get best of both. I then tend to master in Cubase 7.

However, I'm now looking to move back into DJing and ideally play my own tracks too. I'd probably be either using Ableton or Traktor to DJ, as I already have both.

However, just wondering what is the best route to go. I love the compactness of teh Twitch and what I've seen, plus Serato Itch looks intriguing. However, I've also seen people do some amazing DJing things with an APc40, which would lend itself more to the production side too but need some work on mapping.

Anyone got any recommendations for a nomad??