HI Bryan I have the same issue almost. Mine drops by whenever he wants and yesterday when we swapped our S he said he was going to take out the a/c unit for me next week and change the oil in my car. He has know for 3 weeks that I need my oil changed and has not mentioned it but he did yesterday and then said "unless you already had it done" which I had not since I honestly had not thought too much about it. So I believe that is a step forward but it could not be too. I am trying not to figure him out and just go with the flow but then he does something like that and I am all confused again.
As for this weekend I do not think it would be wise to try to get an answer out of her. I think you may have to wait until she is ready to tell you straight out. That will only push her and you may not hear what you want to hear and that could be a step back for you. You may want to just go with things for a bit right now.