[quote=@TwilightDragon]
I think those are enough Servant classes.

[@Sublimation] Do you mind being a regular mage?
[/quote]

Well, technically speaking two mages can make a contract with a single servant (See Lancer in F/Z). Alternatively, Association representative, or the Church judge that protects defeated Masters.