Happy to help!
Seriously though: I don't disagree that it may be a bit of cliche by now, but once you start pulling on those threads here, you can pretty much say that about a lot of things in a lot of games: family harem with a dead father, helping X with yoga, helping Y with shopping and peeking/being invited in the changing room, rubbing suntan lotion on Z... Some things are cliche for a reason, it's because people like them!
They became clichés, because once someone came up with it, people liked them there, others thought if it was liked there, then it will be liked here too, and they recreated it. Overtime, these tropes became overused though, and started to represent the lack of originality. Eventually, people will get bored by the same routine, that's why what flew in BB back in the day, doesn't fly now, and you find it less and less. Shopping peeking, sleep sex, suntan, etc, these aren't that often now, and you'll only see them coming up occasionally within a story, not as a main element. Dead father trope is still very much alive.
Don't get me wrong, I'm fine with using a cliché as a base setup as long as you manage to execute it in an original way, but when you create a cliché and do it exactly as everyone before you, yeah, that's when I say no. As of now, the Athena-Heidi thing falls under the latter category, especially with those cringe like reactions later on.