I'm looking at doing a close-combat Master, whether from the Church or just a muscle wizard.

As for the Servant, since there are no dragons allowed I'll probably use someone from canon. There are a lot of cool options, so I'm not worried about class so much.