I managed to keep details in both highlights and shadows when shooting the solar eclipse this spring without resorting to water bath. Film was EFKE PL100, developed by inspection in Maxim Muir's Compensating Pyrycatechol. You can't get much higher contrast range than that!