Sounds like yours is just as confusing as mine sometimes... I think from what I can tell, you are doing as good or better a job handling this than most people do.
I wish you the best! I don't know, but it seems like to me that she is going to have a hard time finding anyone that is going to work harder for her than you already have......