Hi there I see you're getting some great help already from Skadiver
You should be working on 2 naps and 1 cat nap or 2 naps
Just wanted to say that the first of these is probably the better approach - it's still a little early to be thinking about 2 naps, especiallly if your LO is fairly high sleep needs (as it appears from your EASY). A typical EASY at this age would be 2 x 1.5-2h naps and a 30-40 minute catnap to see you through to bedtime.
When he's rubbing his eyes etc. have you tried a change of scenery to see if that piques his interest? Sometimes when babies get used to sleeping after a certain amount of time they show all the signs of being tired but could really do more if they get a change of scenery.
This is a great suggestion - in the early days of trying to stretch my DDs A time we just used to go for a walk round the garden or the kitchen for 10 mins or so near the end of her A time, pointing out different things and talking/singing to her. The change of environment was enough to keep her awake for a little longer but wasn't too overstimulating just before naptime.
I totally agree about the 5am waking - it sounds very much UT due to a long late afternoon nap and a short day. I would have thought it was a routine issue rather than hunger waking him, though once he's awake he probably realises he is hungry if you know what I mean? It's like if I woke up a couple of hours early - it wouldn't be hunger that woke me but I'd probably still be happy to eat my breakfast, even if I normally ate it later - make sense? I'd also try to aim for a 12h day if you can and gently push out those A times by increasing 10 mins or so every few days.
Let us know how you get on