Ah, yeah, that third scenario makes a lot of sense, as Andy would have stopped having nightmares about Booker as soon as they'd met, and, as you pointed out, Booker is shown with his family after his "resurrection."