Thanks everyone for your responses, it's much appreciated.
Kara - I don't swaddle for naps I just use a sleeping bag in the day. I did this in an attempt to get him used to not being swaddled. I have never swaddled in the day. Did you do anything to ever extend her naps or just go and get her when she woke?
Zacsmumme - I have changed the first activity time and it doesn't seem to make much of a difference but I am worried that that is the trick that I am missing. He gets really grisly when he's tired and as soon as he's rubbing his eyes I have trouble pacifying for long and extending A time by more than 15 minutes. I put him down this morning in advance of eye rubbing, but after just under 2.5 hrs and only got 30 minutes still.
He is very inconsistent as shown today when he had a long afternoon nap (often that's still 30 mins 75% of the time):
6:35 Woke (stayed in cot until 7)
7:15 - 5oz
8:00 - solids
9:10 - 9:40 - sleep
11:00 - 7oz
12:10 - 13:20 - sleep
1:30 - solids
15:00 - 7oz
16:20 - 16:50 sleep
17:10 - solids
18:15 - bath
18:30 - 7oz
19:00 - BT (asleep as usual within minutes)
He can be very overtired for his bedtime and he still is asleep within minutes. Overtired at naptimes however are a nightmare! Is this because I don't have a consistent nap routine whereas at BT it's bath, bottle with lullabies, swaddle then bed? By the time he's eye rubbing I can't do much wind down with him as he's whingy etc..
Thanks again guys :-)