If you're organisation is small/flexible enough, maybe look into using some kind of stacked diff system. We used graphite at my previous company and it's amazing for working with these kinds of things where you have a million little things to fix and they're all kind of dependent on each other.