I would plan your whale watching for Juneau, either with a ship tour, or check out Orka Enterprises, Capt. Larry...They know their whales..
My first Alaska cruise was on Celebrity Infinity, not sure if she is still doing the same itinary, but it was a wonderful Alaska cruise.