Cable management

Do you have any recommendations for cable management? I upgraded my 2015 Brompton with post-2017 handlebars and integrated shifters. The issue is that I can't use the default cable lengths because the pre-2015 H models have a lower stem compared to the later ones. I've been trying to figure out the proper cable lengths for hours now, and it’s driving me crazy.

The problem is that the cable gatherer is touching the hinge lever when turning, which could be dangerous since it might catch the cables. Here’s what I have so far for the lengths: The front brake's lower cable is 485mm. I’ve tried various lengths for the upper part (the green cable in the picture). From what I understand, the rear brake cable pulls the cable gatherer back, but it doesn’t seem to do much, especially since I think I’m already on the shorter side for cable lengths.