Hey Nay. DD sings / chats / wriggles herself to sleep solo now (after 19 months of rocking!) but I cuddled up with her to try and settle her at my parents house the other day and yup, she did exactly what you describe! Drove me NUTS, especially when I was hoping for a bit of a snooze myself! Only thing I can suggest is that maybe you start to put a bit of distance between you. Maybe tell him that Teddy (or other snuggly friend) 'wants to give you bedtime cuddles but Mummy will be sitting on the floor right here'.

Good luck, hope you get a more relaxing bed-time cuddle soon!