If they wanted the Crusher route they could have given them a "moment" on he boat at Worf's promotion and also have him open up and cry talking to her over Troi. Of course if they wanted they could have even had Guinan as his fantasy wife. Use the movie to explore deeper into their relationship and break away some of the mystery of it. Instead of Victorian England style scenario we could see Guinan's home planet as her and Picard are leaving in her old home. What wakes him up to it being fiction is to seeing a fake Soran walk by.
Jason
Jason