For the most part, I think you've done very well man but you have to be careful with what she's doing. If she needs space, she needs to take that space, she shouldn't be pulling and pushing you away whenever she wants you around or wants to be alone. That's not fair to you, if it continues like that it's going to take a toll on YOU. Just be careful and pay attention bro.