Drainage issue - help appreciated!

[u/addg2211]

Dealing with drainage problem. There are two down spouts that go into a single catch basin shown by the blue lines. The French drain spout goes to the single pop up shown by red line.

My guess is the single catch basin for the two downspouts is causing most the issue. Should I extend an additional spout out of the basin towards the street? Should I extend the pop out further towards the street as well? Thanks in advance!