Thanks becj86! Last few days he's happily napped for 1.5hrs in the afternoon, but I always have to wake him from it as I'm worried if he sleeps too much later he won't go to sleep (mostly because he's taking ages for settling down for that nap so falls asleep later than I'd hoped). I'm making the morning nap 45mins now, so he's not getting as much day time sleep as I'd like but this morning although he stirred at 5:21, he went straights back to sleep until 6:45am which is an improvement, so I'm going to stick with this for a few days and see how we do. He's going down to sleep at night about 7:45pm and is falling asleep pretty quickly so it seems to be working despite his last A time being very short (2-2.5hrs).
Any tips for waking up a sleeping baby without making them upset? He hates being woken up from his morning nap, but I have to do it as otherwise he'd sleep for over 2hours! I try and do it gently but he almost always ends up crying until we get downstairs and he realises his lunch is all ready for him!