Great info in the links - I've read them all at some point or another, but I had forgotten about the age adaptation one. Thanks!
So quick update - we've successfully lengthened the A times all around, they're between 2.5 - 3hrs each. Day 1, both naps were almost 2 hrs (with a resettle after 30 mins for the second). Day 2, first nap was long, 2nd nap was 30 mins, 3rd nap was 30 mins. Day 3, first nap 30 mins, 2nd was 2hrs 50 mins(!). Today, his first nap was 30 mins, and he's just down for his second. (If you want me to post the EASY I can.) So we're getting more longer naps, but no consistency yet. We'll keep at it! Nights are definitely improving - we've had a couple of solid nights, and any wake ups are shorter and MUCH easier to resettle.
Now to start again with food and hope it doesn't get bad again.
Thanks!
Gillian