Thanks everyone for ideas and hopefully this thread might be useful for somebody else.

I, actually, change the ticket to later departure. I get home later as well, but at least I get a good night's sleep before flying.