I just booked a whale watching tour with Harv and Marvs Whale Watching. I did this same tour a few years ago and it was amazing. Stopped at Mendenhall on the way back and taxied back to Juneau. They pick you up at the pier and return you; they recommended doing the morning tour (4 hours), lunch in Juneau then taking the shuttle to the glacier and Nugget Falls.