Indeed. We don't claim that earth bitch, she needs to be slaughtered or something. Anyhow, I totally agree with what you've said. It's sad to see Khaol suffer from conditions that he can't prevent either control and well I hope Khaol tells his current lover sooner rather than later, spill it before it ruins you. From the beginning, the pair weren't meant together (for now), Khaol had personal problems and Rivers was too naive to suspect anything wrong particular, he was too occupied with repairing him and at the same time falling in love with him. It's just heartbreaking to see them harm each other, Hiel is a good guy, however, a part of me can't except such plot twist.
Honestly, it's horrible and awful for both of them. Bash me as much as you want, it's just how Khaol dealt with the same predicament over and over again. River must have known and could've backed down, however, he stayed because he wanted to help him heal, though in the end he got hurt himself because If such an option.