Sometimes I wonder if I would have been as attracted to her in the past, had I resolved my NGS issues sooner. I honestly don't know.
Your story is slowly selling me on reading that No More Mr. Nice Guy book. In life, I typically don't do "nice" things (holding open doors, buying a date a glass of wine) with any significant expectations. I do them because I like seeing others feel happy. I have to admit it was different for me once in a relationship and in the "Circle of Trust". Good for you learning some things about your boundaries, what you want in MR2.0, and finding ways to have deep conversations with a difficult partner without cycling/spinning.