I can understand your concern since Maya's going through a lot of changes and she probably is stressed out because of them.
What i'm about to suggest is what you've been doing for bedtime, it's called gentle removal plan and it has worked great for me and other moms around here whose little ones just won't let them "away". One of Tracy's principals was "always go to them instead of them going to you", so by all means, do not let her in your bed, it might be exhausting the first weeks but it will pay off in the end.
Gentle removal is putting a mattress (or sleeping bag) on the floor next to her crib at bedtime and you sleep the whole night in her room. WHenever she wakes, she sees you there, you reassure her and help her go back to sleep (it's ok, it's night time, mommy's tired and needs her rest). As night wakings improve, you start moving your mattress near the door (away from her crib) in 3 day intervals (just as you've been doing for bedtime) till eventually you're out of the room and back to your bed. By then ,the habit of going to your bed will (hopefully) be broken. After gentle removal, you will be in your bed and if she happens to have a setback, you just redirect her to her bed saying it's night time the first time it happens. For the following events, you just lead her to her bed, no words, no eye contact, maybe just some pat/shs to reassure her that you love her but you're in control too.
Since it's been a 2 year tradition, it will be a hard one to break. But it's totally doable if you're commited to it and prepare your body and mind for a few sleepless and VERY LOUD (she will protest) nights. It's all for her sake and for the family's sake, you're not torturing her or leaving her alone, you will be right be her side. But sometimes it's a hard lesson so it will be some tears.
HTH and good luck!