Naomi's Story has sequence breaks. Main story part 20 for her does not check for if you have the 6th girl or not yet. I don't even have the fifth so it was jarring seeing the event and character icon spawn.
One of Rae's quests did had a sequence break name dropping girl 4 but that led to only minor confusion.