I think you are heading for the 2-1 nap transition. I'd do is keep his morning nap at 10, regardless what time he wakes up, and either cap the nap at an hour so that he'll take an afternoon nap, or let him sleep and then just give him a 20 mins catnap at about 4pm.