Thanks guys - I was also thinking perhaps putting a fold-up bed in her room. Surprise, surprise, last night I took her for a swim at mums, gave her a bath and then came home and put her to bed. SHe woke up and I immediately picked her up and sat with her in her room in the rocking chair til she calmed then put her back into bed. She slept til 9am this morning!
Hope this is not just a one off!
I think that instead of waiting too long to see if she'll self settle, i'll go in reasonably quickly and calm her down quickly so she doesn't work herself right up.
Let's see how she goes tonight!