Yes it does take you back to square one. You do whta is within reason. Don't give her everything she wants or that is what she will learn. If you give her that she will not learn to that it takes two. If you try friends with benefits then that is the deal you get. Her deal. You need to imagine some compromises and hold out for them. You have come too far.
I love helping you because you listen