Too forgiving. Edelgart is one thing (she promised not to hurt them, and they have received no indication that she was part of the plan to harm them), but the suicidal knight deserves death.
I would personally love to see Edelgart swear her loyalty to the Diablo, as his slave.
I expect her to become an indirect slave at the very least.