Reply to Drum pad controller for traktor and ableton use

I am looking to add another controller to my S4 setup. I really want something that I can use as a drumpad and general controller in ableton but that can also be mapped to traktor with the Instant Gratification MF mapping and for things like FX 3&4.

I realise that the Maschine would fit the bill perfectly but it's a bit out of my price range. I've been looking at the Korg Padkontrol and the Akai MPD32. Anybody use these with traktor? Any other recommendations?