I now use:
traktor 3
akai mpd32 midi controller
Audio 8 DJ external soundcard

I was using traktor scratch to try to keep with the vinyl control but as I think somebody has already pointed out there's not really any point in trying to emulate vinyl/cd when a full digital setup is more straight forward.