How about make it that Celebrants get one free vow per threshold.Faith spells become knight and celebrant only.Knights and celebrants can choose to gain a level of faith spells instead of their free stance/vow each threshold.