Oh crap! That can be a really difficult age for sleeping and seperation anxiety. DS was exactly like that and I'm sure I've read lots of posts from other mums in the same situation. I can totally understand how stressed out you must be with a baby almost on the scene though
I'm sorry I don't have any real advice - DS just gradually grew out of it.