For close range, I would suggest some form of jujutsu. Most varieties should have a pretty complete battery of techniques-- punching, kicking, locks, grappling, etc., but the focus will be on close in techniques and fighting on the ground.
If you're interested in self-defense rather than a...