I'm totally fine with him killing her in the end, especially since she stabbed him first. There is absolutely no conclusive evidence that he was pre-meditating her death. As a matter of fact one of the things that convinced her to kill him was that he was going to kill Olan and Valmafra, characters who knew his entire plan and he just let walk away.