ACOMAF/ACOSF similarities

Did anyone else notice how the relationship between Feyre and Rhys ACOFAS/ACOSF starts to mirror the one between Feyre and Tamlin in ACOMAF??? Or the general themes of the books? In the beginning of ACOMAF and ACOFAS, the characters try to figure out their lives after the big evil has been defeated (allegedly) and try to rebuild everything. Feyre is with a guy she barely sees because he is often gone doing High Lord stuff while she sits at home, but when he is there they mostly just have sex. She also spends most of her time being quite useless, the citizens of the Court do not want her help and are just eternally grateful for her to a point where she feels uncomfortable living in excessive wealth while parts of the Court were destroyed in a war. She also spends her time painting, responding to letters and there is mentioning of a baby in the future.

While everything seems to go back to normal again and Feyre and the High Lord she is with seem to mend things in this new world, it all leads up to a moment in the future (ACOMAF/ACOSF) where the High Lord becomes obsessively overprotective and takes Feyre's bodily autonomy away because of a danger to her life that he tries to find a cure for. He doesn't include her in his plans because he fears that any mentioning of the danger could make the situation worse and endanger Feyre's life even more. The people close to Feyre and the High Lord only follow the orders of their Lord and are too scared to speak up against him....and we all know how it ends.