Martial arts like kung-fu,karate,taekwondo,boxing,kick boxing.. have that punchin and kickin thing..
but are not too good in a close fight (most of the fights are like this) cause u need space to throw a punch or a kick. Now judo (mine),BJJ,sambo,jeet kune do,submission, wrestling.. have more close fight like throws, pins and armbars but lacks in an open space.
so i advice u to do krav maga if u can cause its by far the most complete they even use it in the army.