After the different phases I have been through in my sitch, I don't think you are in a bad position. Being comfortable with eachother is a good thing IMO.
As nice as it is to talk to her, I still think you should make sure you are not always there for her. Friendly but mysterious. I had it for a while!
BITS
Happiness is not something ready made. It comes from your own actions.
