Baby and toddler sleeping probs

My husband and I have just had to downsize from a 3 to 2 bedroom place which has meant our 8 month old and 2 year old now share a room. We knew we were downsizing so had them share for a couple of months before we moved in hopes it would ease them into the change. Unfortunately, the big move across the country has unsettled Miss 2 and I am on the brink of a break down from lack of sleep. My baby cries a lot when we try to put him down as he used to fall asleep feeding but has outgrown that. Every night one of them will wake the other one and unless we separate them it is a whole lot of tears trying to get them back to sleep in their own room. We have been so tired lately that the 2 year old has been sleeping in with us every night for the last 2 weeks but she is a restless sleeper and I often wake with a foot or elbow to the face.
How have others succeeded in this transition? I am following the Save our Sleep recommendations as far as 'self soothing' but often cave in when one starts screaming and the other is asleep.