Reply to X1 + Z1 of s4mk2?

Hi, I'm believeing of either getting the updated Traktor X1 and Z1, or the S4 mk 2, any thoughts on either, or is there anything better, so many conflicting opinions on-line, I club dj 6-7 times a year, mainly using it at home tho. Used to use the old x1 and z1, liked it a lot but i stupidly sold my macbook ant the controllers (long story). I now have a I5 macbook pro 15", just don't know what way to go controller wise.

Any advice/help is greatly appreciated.