So I've slept on it, and decided what I can and can't use. What stirs me about your advice is the premise that I can and need to bring in my boundaries in this relationship. That I given her "freedom" in the form of not enforcing my own boundaries, and this has had the unintended effect of increasing anxiety and resentment between us.
What I also like is the picture you painted of me moving back in. I like that it sets a standard for more or less what my role _should_ be in the relationship.
BUT, carrying out the plan you laid out would require more confidence and a greater understanding of myself, my role, and our relationship than I currently have. When it came time to go "off script" I don't think I could continue to operate in that frame of mind....YET.
I will keep that scenario in mind, but for right now, I've got to get centered again. I need to pick one or two things to work on, and trust that I'll have time to get to the rest.