We are using Two Bath development to hold information in the negative which would be lost in normal development. If we lose shadow information, we are quick to blame 'thin emulsion' films and suchlike, but what the problem might be is underdevelopment, caused by our contemporary idealization of a 'proper negative'.
The simple solution is to ignore Zone I. Develop for Zone II and Zone V.
We (conventionally) base our film speed: Zone II = .1 ~ .15 + Base Fog, or some similar notion, which is a very good way to work with normal processing. It can, however, lead to a lower Exposure Index with Two Bath development (or Minimal Agitation). But if we increase the gamma of the negatives, we can usually get a higher Exposure Index AND induce desirable compression through the higher values.
Consider Zone V as the fulcrum of the negative, balancing Exposure & Development. If we increase the development, we know that we can't increase the Zone I density, but we CAN increase Zone V.
What we want from a Two Bath developer (or Minimal Agitation) is to expand the shadows, compress the highlights, and have normal midtones.
Develop for Zone II instead of Zone I. Balance A & B for Zone V. Allow the film and developer combination to give you the highlights it gives you. The negative may well have a higher Dmax, but it will also have the desired curve shape (or tone curve). Take up the slack, if necessary, by printing with a softer developer than Dektol (or printing on a softer paper).
.