Ah thanks everyone for your advice, it feels so good to know that other babies do this. All the babies at MG are such good sleepers, makes me feel like a failure sometimes.
Last night was quite good, she slept in her cot the whole night and woke up about 7 times which was pretty good, coz I actually slept between the wakings and it was great being able to cuddle up to DH!
I'm getting a new bed in a few days that I'll probably buy a side rail for if she still needs to co-sleep, but I'm going to try and keep her in her cot coz I think we both sleep better that way, weirdly enough!