oh yes, my LO is the same too. I have to really get him to sleep before that stage - i've worked out that during the day it's best to try and get him to nap after 1.5 hours of being awake or atleast look out for the signs then. I've got a 1.5 hour routine (ish) going which i really stick to in the morning or he gets grumpy. He got himself into this routine, or rather I notivced it when spotting his grumpy times! Once I worked his clock out the day got a lot easier. The afternoon is more flexible for us:
wake up
1.5 hours after waking = nap.
wake up.
1.5 hours after waking = go for walk for 1 hour (baby naps)
wake up.
1.5 hours after waking = nap.
wake up.
2 hours later nap.
wake up. keep baby awake till bedtime.
The only time he stays awake longer is in the afternoon - I try and keep him awake and active for 3 hours ish before bedtime (I dstract his grumps then by having a bath an hour before bedtime)
I started putting him to bed much earlier about 3 weeks ago and its so much easier now. He still grumbles but not nearly as much.