I would probably give the edge to Elektra, but not by much. Shingen only really has one fight of note, against Wolverine. He didn't do too badly, but Logan, while effective, is not exactly some technically skilled master combatant. Elektra has more feats, both against Hand ninjas and a Chaste assassin, which is basically why I am giving it to her.