Definitely the old one. The idea of having to pick and choose buffs is -neat- and the new food items are cool too, but no matter how much you mix and match right now you're FAR weaker than you were before this patch.

I'm not saying that they should scrap the new system, but between the old system and the -as it currently is- new system, I much prefer the old one. It needs some heavy tweaking.