for #1, i could add a non-lethal damage clause, seems to make sense all things considered. Seems to make sense anyway...
I definitely like #2, and it wouldn't make the class entirely broken either, if done right. i'm thinking i may "more evenly" spread the Ley Lines abilities out, and add one...