Instead of rushing to one nap, have you tried limiting length of first nap? You might want to try to cut first nap at one hour (or even 45 minutes) so he can still get in a good afternoon nap. If that doesn't work, let us know and we'll think some more!