Couple of further points. A soldier if he is to hold the title of one should no how to fight with any weapon. I always thought it was very fitting for the Marine Corps Martial Arts program motto as "One Mind..Any Weapon."

The original H2H system of the WW2 taught by Fairbairn and Applegate was called Close Combat and started at handgun/sub machine gun range(point shooting) then to the Bayonet, then to the knife, then to the stick, and finally as a last resort H2H. Marine Historian Chuck Meslon wrote a book on this subject called "Combat Conditioning" which reviews the H2H,PT,and Obstacle courses used to condition Marines in WW2, he points out that one of the most serious problems with modern combatives is that they have left out the firearms part and it is a problem that should be corrected. The book is available from Paladin Press and is pretty cheap, has many drawings and pictures and the complete syllabus for the close combat course as taught to Marine officers.