Personally, given his decent night and reasonable nap, I would do 6:45 - you can keep the last hour after dinner very subdued, quiet time, and then move into bedtime. See if you can get a slightly later wake up tomorrow.
But I like to live on the wild side and have a kid that lives in OT land anyway so nothing much I do can muck it up :-)
Oh, just read about his jabs, well you will have to play that by ear then really. He might be extra grotty and need earlier bedtime.