Where were my manners - I didn't say thank you last night for all of your support and suggestions!
She eventually settled back in her room (swaddled and using baby whisperer's shush pat thingy) at 9:40, and slept until 7 this morning (she normally gets me up between 2 and 5 times a night, so that part was good!).
Harold, believe it or not, we did use a cranial osteopath and saw a big improvement. We couldn't even lie her down for the first 6 weeks without her screaming (seemingly due to headache from compression at birth), and that problem disappeared overnight. Saw her a couple more times to help with her colic too, although we finally discovered at 15 weeks that her colic problems were largely related to her being milk intolerant. I've since completely given up eating dairy, which has helped on that score.
Frizbe/Hairymclary - I missed that point last night! Didn't realise you could give both together. Frizbe - you told me this the other week didn't you, but when you said 'cross load' I thought you meant one and then the other the next time - doh!
hmc - we have a carrier that we use with her a lot, but at night she simply has to go to bed at some point, and I am quite strict about bedtime routine and getting her down between 7:30 and 8.
mymama - sometimes she does get overtired yes. I had been trying to resttle her (without eye contact or talking) for the hour before I posted, but last night it just wasn't working.
SittingBull - days don't follow a strict routine, as they tend to be driven by how well she has slept the night before, and when she gets tired, but generally she'll be up around 7, go for a nap at 9ish (this one varies between 40 mins and over 2 hours, depending on how much sleep she got overnight, but 1 hr 20mins is about average). She'll usually have 2 other naps during the day, but these will be shorter and can be difficult to settle her for. She has always been fed to sleep, apart from a spell of about a fortnight where she would settle walking in her pushchair after 5-10 mins of crying. I watch very carefully for signs of tiredness (usually eye rubbing) as I'm with her practically the whole time as she doesn't like to be without me for more than about 5 mins!
All this is based on last 7 weeks, as before that all was chaos and overtiredness due to pain from milk intolerance.
Sorry this has turned into war and peace!