So, it all turned to poo after her first wake up. I was back to going in there every 20 minutes until at 11 I had a little tantrum myself and got into bed with her. She wasn't brilliant there either, but I think the difference is that I can snooze and settle her at the same time.
At one point I asked her to 'show Mumma your owies' and she pointed to her mouth, so today's task will be getting some nurofen. She also had a bit of a blocked nose so more vapouriser stuff for the humidifier while I'm at the chemist.