I know all of that feels good and seems like things are going in the right direction, but I think you are being used. She is cake eating. All of that stuff means nothing if she is still engaged in an A. If she is, you need to steer completely clear of her. If the A is still ongoing, you are only prolonging it by allowing her to cake eat.
Me: 48 y/o W: 47 y/o Together: > 20 yrs BD: Dec '15, then S 2nd BD: Mar '16, then I filed for D April '16: started piecing