I have thought of revamping this myself. Essentially I was thinking that Martial Arts is essentially the same as Close Combat: Unarmed. In essence your idea for a martial arts skill is now part of the game.