I think it was great you moved back into the bed. Don't give her multiple options, she can figure out her own options. If she gives you crap, just say that she is more than welcome to sleep in OUR bed.
And lay off the MC for now. Continue to confuse her with this new you.