Yeah man. It looks like everything is sorting itself out... sort of... The only think I would be worried about is if her boyfriend takes it badly, and she goes directly from him to you.. he might get some ideas in his head and he wont like it. Once she breaks up with him, have some time in between when you join up with her as a buffer to let things to cool down.