I think I’ve finally got it!
>Saber
Beni Enma
>Archer
Takasugi Shinsaku
>Lancer
Melusine
>Rider
Ozymandias
>Caster
Izumo-no-Okuni
>Assassin
Kashin Koji
>Berserker
Sen-no-Rikyu
>Extra I
Nitocris Alter
>Extra II
Ashiya Douman