Thanks for the reply. You’re right. Things have already changed! She’s still taking a while to settle at night but at least we have fewer night wakings now, so I don’t have to have the battle multiple times a night!
I get confused about whether she’s hungry, windy or tired so I’m never sure whether I should be feeding, winding or putting her down. Possibly I’ve overfed her or let her get overtired after spending too long winding her a few times.
I could try the catnap and later bedtime, although I do quite like having both children in bed at 7ish so DH and I can eat a meal and have an adult conversation!