What got me is that you said your gf is not really comfortable with your bf having a gf. That says it all. I don't think it will get better, because it's not something she wants, and therefore, I think you should move on. I'm all for staying and trying to work things out, but in order for that...