Hi Mickeep,
You're right, I think a lot will have changed in terms of improvements by the time you go. But... it looks like you will be arriving at the busiest time of year and from a cold weather place so both of those factors could hold things up a bit.
Having said that, two hours from the time you land seems more than reasonable!
Enjoy,
Bob