Actually Angel, I'm pretty sure Ady said he would be making it more obviously sunrise, so I think you're closer to the final product than previous previews!

I believe the timeline will be arrive at sunrise, get changed, get captured and tortured in the late morning, Luke comes in the afternoon, everyone escapes as night is falling.

I've always thought that they arrived at sunset, spent the night (giving Leia and Han some alone time, if you know what I mean), they wake up the next morning and Leia is upset about 3PO being missing "for far too long to have gotten lost", then it goes until sunset again where they escape.