This...
It's time. I completed the first drain and fill. Got ~5l (so 50%) of the fluid out with an overnight drain and added ~5l back in, checked fluid levels correctly and the transmission is working well. Noticeably better. I'll drive it like this for a bit to allow the adaptations to... adapt then I'll repeat (no rinse!!).