Reply to Which way to go?

Hi there,

After having done quite some reading on this website, I decided to make an account as well and drop my 'problem' here, hoping you guys can help me out a bit!

To introduce myself at first: I'm a hobbyist DJ playing mostly house (from deep to electro) and some techno and dubstep. I also do the occasional (student-party) gig here and there, but nothing too serious yet. My current gear is a Numark NS7 with a 17" HP Pavilion dv9000 laptop. The problem I have consists of 3 parts:
1: my laptop is buggy and lacks power
2: I am sick of carrying this big mofo around, even for a gig a few kms away I need to borrow someones car to get it there
3: I lack options on this controller. I feel like it limits me in expressing my creativity.

So, what I want is the following:
1: A nice, lightweight controller(s?) with which I could steer 4 decks, sample decks etc. with Traktor
2: I want to have more optionability towards on-the-fly live remixing. Say, a piece of gear with which I could instantly add some extra drums etc. I don't have a clue yet to fill this gap in, all I know is that I would like it to be as intuitive as possible, with not too much preparation needed. Integration with Traktor would be nice I guess.

I already set step 1: I recently bought a brand-spanking new Macbook Air with i7 processor and 256gig SSD

I've been looking a lot at the VCI-400 already, also the ultraportable Xone K2 looks promising. Maschine looks nice but already seems terribly complicated to me.

So, do you guys have any advice on which way to go? Thanks alot already!