I personally don't really like the this whole "hentai/porn logic" thing to be honest, because it often simply leads bad and lazy stories. In the end they invested a lot of story time to build and develop Eve's character and her relationship with MC, to have this really nice and sweet romance and it just seems too far out of character to me. You'd need a lot of dialog and the outcome would probably still be far from good.
As said, I fully agree that the current situation isn't good, but a I don't really see a good way out, either. It's almost tragic that the new scene kinda made it even worse compared to how it was before. But yeah, just writing something to have an ending that's not totally bad seems rather unworthy to me. But that may just be my opinion which is just as good as anybody else's.