I'd try adjusting his bedtime to half any hour earlier. Sounds crazy I know but it worked here.