Hi Mel, what time are the naps now? Ideally you shorten the morning nap & at his age it would be no less than 45mins & than do the afternoon nap about 3-3.5hrs later & bedtime about 3.5hrs after the pm nap.
The eating routine might be a little off & you'll have to be creative (like split lunch or give a big snack before nap & then lunch after). At this age, Jasmine was doing
6ish am - wakes
9-9:45am - morning nap
1:15-2:45 - afternoon nap
6:15 - bedtime
Then she started waking up earlier for the day & I pushed her morning nap to 9:30-10:15am, afternoon nap to 1:30-3pm & bedtime at 6:30pm
Layla