Such a thing isn't truly needed. The Grail can still be a cup; it's just at risk of premature destruction. Which is a lot less bother than an NPC.

Unless someone plans to play an Einzbern homunculus, which solves the problem, but requires some handwaving regarding surviving to the end of the war without being crippled into unplayability. XD