How about having a full-on mixed martial arts that includes:
1. Sword-fighting - perhaps use kendo and western fencing.
2. Pistol - use simunitions
3. Espionage and position Counter-Espionage.
4. (Insert your combat art)
.... all this can be done with teams, with each member specializing in one aspect, but proficient in all.