Bit late joining you here, but I wanted to offer hugs and sympathy. Annabel sounds just like Jack - we had awful long nws until he was 13 months, and he's always been prone to EWs too. In fact, they've generally stopped but are back right now cos we're away, and that is enough to disturb his sleep. Like you say, it's every little thing....
Anyway, in terms of actual advice, I found J needed one very long A in the day to sleep better at night. At 9 months I'm pretty sure any sleep after 2.30pm made nights worse. That's with a 7pm bedtime. He's very lsn though so the time may be different for you, but the principle of needing a decent A before bed may still apply. He also needed around a 13 - 13.5 hr day, and a decent first A too, unless he had a very short first nap. I also found that he could do almost a full A after a short nap, so if you did want to do long AM, short pm, you might find that your cn still needs to be done by mid afternoon in order to keep a decent A to bed.
We were in the last throes of the 2-1 at 9 months - I'll try and dig out what our day looked like....