Another question so when she comes over on the weekends since she lives in the barracks she has been sleeping here to be her when my son wakes. We have been spending this time together having drinks watching shows and talking. Should I pull myself away from doing that with her?
Sometimes yes, sometimes no. Dont follow her around grasping at every opportunity to see her. Sometimes, make plans to go out with a friend when you know she will be at your place.
The key to both of these questions is that you dont want to focus your life around her. Let her be a part of the fringes of your life. Live your own life with or without her.