Ok, I may have made it worse for myself in the long run, but I have been giving him a cup of milk when he wakes and he goes back to sleep and yesterday he slept until 8am. I don't want to get in the habit of feeding back to sleep but if I can get him to sleep later then I can push the naps back.
What do you think?