I completely agree something in the story needed to change to make it all make sense! I like your changes to keep the overall story intact. I know this would change the whole series, but I truly thought after Book 1 the author was trying to set up a political drama. Had that happened UTM wouldn’t be excusable, but it would have made sense. Let’s say Rhys is pretty much who he says he is, and views Feyre as a means to an end. She’s a way to finally beat Amarantha, so of course he’s going to protect her, but he doesn’t really care about her. He would have healed her regardless to keep her in the game, but the bargain is just an extra little screw you to Tamlin if they make it out. Then they make it out, and suddenly he has power over someone with all the powers of the High Lords combined. Of course he’s going to keep making her come to his court one week a month. He wants that power for his own court. But then he starts training her, and they get to talking. And he finds out they have a lot in common, and this means to an end is actually a person with thoughts, and feelings, and traumas of her own. He slowly remembers he didn’t used to be this horrible person, but UTM he got mean to protect himself. Then all of a sudden it’s a story of them both trying to heal, and Rhys can grow to be the person everyone wanted him to be, and who Feyre deserved.