well after a night like that you just have to go with it, imo. Think of today as a freebie, put him down super early and hopefully it will help him get a good nights sleep.
Is it possible for you to get him down by 6?
I think I have started to see some improvement in the nights by putting him down earlier by about 30 min consistently. So he is in crib between 630-7 and eventually falls asleep 30 min earlier than he used to