I gave up on this issue as well. I don't have the heart for cry it out in the middle of the night. Danica starts out in her room and sleeps til anywhere bw 1 and 3. We both sleep. Win win. Not sure how it'll be once baby arrives but oh well.
Oh and she now just gets out of her bed, brings her water and sets it on my table and climbs in my bed.