Hey girlies, Happy Xmas.
Well hon we had similar problems with my eldest son.
We basically stopped him coming in and helping him settle in his own bed by simply TAKING HIM BACK TO HIS OWN BED.
EVERY TIME he got out of bed, came into our room etc we took him back popped him into bed with a little pat, an "I love you" and walk out. and even through all the screaming and pretend tears(sometime genuin) we carried on taking him back and it worked.
It did take a few days(about 4 I think) and probably over 100 times being returned to bed a night to start with. And sometimes we didnt even get out of the door before he would come running after us.
He now(7yrs) sleeps all night, 12 hrs most nights as do my two girls with whom we used the same tecnike(sp?) whenever we had a bit of a blip with their sleeping/settling.
They have always had a soothing night light and keeping a special teddy/toy for bed is a must for my 3 as its comfort for them.
Strangly enough I didnt get as stressed as I thought I would, maybe because it needed a calm head and needed to be done.
This is only my personal opinion though, find a groove that works for your lo and you and stick with it.
Good luck hon, dont give in, it is for the best in the long run and it will help tremendously once your next lo is born.