I would recommend Judo as there is much more sparing involved, thus more practical training. That was my experience at least, in punching sports people tend to hurt each other when they spar so it's avoided or at least not done with full force, where as in Judo you always give it your all (either in a clinch or on the ground).