I wonder if whales will ever evolve a supplementary sort of gill system, not to replace their lungs but to enhance their dive time.

That seems like the best of both worlds