Upgrading to a pioneer controller

i currently use either 2000s or xdj for most of my gigs, however for some of my quieter gigs i just take along traktor (pro 2) with a denon mc6000... however I've been wanting to upgrade that to a similar pioneer model, whats the best and most adaptable to traktor as I've seen some online info about some problems mapping them to work 100%.... also I'm not one of these 'i need 4 channels!!!!!' types, 2 would just do just fine.

thanks in advance