Mel, our DD was a 'happy' waker at your DD's age as well. And she would come into bed with us (doubly so because we took the sides off the cot as I HATED getting up in the middle of winter when it was cold!). We had to get 'tough' with her (haha) and enforce that she was very welcome in our bed, but it was not playtime. I had no troubles giving her a drink (in bed with us usually) once I night-weaned her at about 17 mths, but bed time is not party time. She was told very firmly that she needed to lie down and have snuggles, or back to her own bed. I did have to take her back a couple of times, but she got the idea relatively quickly (with a surprisingly small amount of noise!). I kinda felt it was a compromise between allowing her to cosleep and still actually getting the sleep part of that equation!

Don't know if that helps, but that was our experience.