To be honest, with DD i keep putting her into her own bed until she goes to sleep. That has taken hours in the past when she was sure if she kept trying i'd give in. If she gets up again before i've gone to bed and fallen asleep i comfort her and again put her back to bed in her own bed. If she wakes screaming at 4am i let her come in with me, mainly because it's the fastest way back to sleep, BUT if she then won't go to sleep and is chatting to me instead, i put her back in her bed.

If i were you i'd set a week aside where you don't need to be up early or have too many demands (hilarious with kids/PG/family/etc. but you know what i mean - minimise it all) and make that the week you show her that bedtime=bedtime. DD will get up 20+ times with XP who is a pushover but with mummy she knows she'd better just go to bed. lol.