You can redo the French drain network. Add the 2nd box. That will help for sure.

I'm a retired contractor and had several jobs somewhat similar though clearly not exactly... IME The best long term solution was to re landscape, redo some of the concrete and put a permanent drain in a welled out concrete section with a cleanout. The cleanout is really important.

I also don't hate the idea of putting in a little retaining wall and if you want to diy it, it's not as hard as you might think.

Good luck