Make sure to bring a printout of ESTA confirmation with you to simplify things. DHS can also be painful about random things - had a colleague who was refused permission to fly recently despite ESTA etc (think 5 people weren't allowed on plane...)
And if you can turn up sooner, that'll be better - even if it takes 10 minutes to resolve you don't want to have left it too fine