Reply to Upgrading Recomendations

Alright guys, I am in the market for a new controller -

I currently own a Novation Twitch, and a Mix-Track. I've owned an APC 20, 40, and MixTrack Pro.

I am currently looking to upgrade a something with good jog wheels, internal sound card, and I would prefer that it have multiple types of out puts rather than just multiple RCA outs, or just 1/4in outs. Better yet if you could recommend me a combination of gear (CD player, turntables, mixer, DVS box, ect thats within the below price range, that would be great)

800 dollars seems to be my price limit -

If it helps, here's a mash up I recently recorded during a live set, maybe it will help you ID my play style, making it easier to recommend a controller. All I know is that, I really like having a decent amount of cue points and loops saved.
https://soundcloud.com/ddanse/kyoto-...lings-dj-danse

Thanks for your time.