Pardon the inconvenience, but is there, or will there be a way to help Naomi and Shanna make up that does not require the hot spring event? I sincerely do not care about the hot spring scene itself, and do not regret punching that guy. I just want to progress in Naomi's storyline.