Where does Diana end up (SPOILERS)

Well,I certainly have alot to catch up on!

I found the Diana custody situation confusing. Daphne decided to move to Texas with Luke (to some city that wasn't Dallas), and she wanted to take Diana with her, but then Charlie told her he would fight her, and so she decided she would stay in San Francisco.

Then at the 11th hour Charlie shows up at Daphne's apartment the morning Luke is scheduled to drive off to Texas and basically said he changed his mind and brought all of Diana's stuff with him. So, Daphne packs up quickly and Luke/Daphne/Diana drive off into the sunset.

Then about a month later Daphne shows up at Charlie/Kirsten's doorstep with Diana. She says that Luke is away on army business a lot and that she's left alone and doesn't have any friends, so she decided to come and visit.

[some time elapses & I'm not sure what goes on with the custody. It seems like Daphne comes to SF now and then so that Charlie can spend time with Diana]

Then Daphne tells Charlie that Luke is moving bases to Dallas, and she can't bring herself to pick a place to live because all she can think of is Diana not being there. (Yeah, this confused me too.) I'm not sure why at this point Diana seems to be in Charlie's care a majority of the time.

Daphne decides she's going to move back to SF, and break up with Luke because she can't ask Luke to give up his military job.

Then after Bailey decides that although he wants to go to college in Philadelphia but can't because of his family commitments in SF, Charlie decides to take the lead and basically fires Bailey by hiring Luke. So that all of Diana's parents would be in the same city finally.