Used to use Ortlieb panniers and I have recently changes to Vaude Aqua Back Plus for some incremental additional volume and also the external pocket. I could see that it is easy to replace the male end of the buckle but I guess it could almost be the end of the bag if the female end is broken?
…or maybe you could show us as well how to fix that too, so that we could have some comfort other simply praying that this would not happen!