[@Crusader Lord]: Hmm... Given we screwed up and this is a flawed Grail I'd say it's not impossible to excuse one of those things this once.

That being said, I'd definitely say Avenger is kind of gimping yourself in most cases, so I'd advise against that.

I think the easiest to work out would be a "Fake" Servant.