That's fair, thanks for suggesting it. I could definitely see Kimochi being the easiest one to give an alternate happy ending to if something like that was ever added.
What sort of improvements are you hoping to see for Noriko's current femdom route?