Congestion pricing seems to be the simplest solution. Has nice clear incentives and less excessive top-down city planning.