The nice thing about the combination glacier/whale watch tour is that you get to do two of the best things Juneau has to offer. Hard to pack Juneau all into one day, as there are many good options there.
Can't speak for the other 2 choices you mention as those weren't available for us. Icy Strait is a very new port - until recently, it was just a cruising day.
Enjoy Alaska! It's one of my most favorite places!