Okiday, I ended up using the good church doing rehab of evil characters thing you suggested (my NPC cleric rolled very well on her Knowledge: Religion check), and that worked out marvelously for the group, and led to a very funny role-playing bit with a reformed beholder. Crisis averted! :D