Going to be facing a similar thing here and we did the same as you, all bundled into one bedroom but seperate beds. DD will sleep in her bed most nights but she doesn't fall asleep there, I will breastfeed her to sleep in the chair and move her once she is asleep. Would it work to try moving her when she is asleep? Also how dark is the room? We had a period where DD would wake up crying and wanting to come into bed with us till we realised the room was too dark, once we got a nightlight and she could see us when she woke up, she started resettling more times than not on her own.

I'm not sure what will happen when bubs comes along and am worried DD will be disturbed all through the night by bubs waking but we are just going to see what happens and hope for the best haha we just don't feel right trying to force anything more yet.