Thanks! All very helpful info. Our confirmation did list Newhaven, but it was changed after that. We may just save Edinburgh for a future Scotland-only trip.
We would like to do both the kayaking and included bus tour in Geiranger. I would prefer to bus in the morning (8:30-11:30) and kayak (12:45) in the afternoon, but don't want to miss the paid tour if the bus tour comes back late, plus the tender issue. Will have to look into whether we could find some lunch where ever the tender docks, to stay there between events.