If I were you, I'd go with one shot ID-11 in the expert tank - you already had ID-11 working, so you only need to work out the adjustment to your times for one-shot and rotation. A change in developer will only force you to start from scratch, for little, if any, benefit. XTOL is not going to be any better or worse than ID-11 (or other mainstream developers) with old style thin layer film like CHS.