The problems
  Floods of 1861-1862 , approx 30-35 MAF in additional Central Valley runoff
    from 6 "Pineapple Express" storms in 5 weeks (runoff figure is an
    off-the-record guess by a hydrologist) ( mjbarkl.com/floods.htm )
  Reliable, affordable irrigation supply
  Loss of the snow pack to global warming
  Flows for the salmon on the San Joaquin
  Flows to flush salt and contaminants from the Delta
  Reduced Delta pumping for the fish and the flows
  No peripheral canal or silly tunnels
  Hetch Hetchy
  Supply for Los Angeles
  Supply for Arizona and Southern Nevada
  Endless squabbling and redundant expensive reports

The answer, Storage, CVP III :
  Suspend § 8 of Reclamation Act/Newlands Act of 1902 and its progeny and 
  other conflicting statutes for this project, removes from the equation:
    DWR
    SWRCB
    CWC
    CCVFPB
    CEQA
    Cal ESA
    Voters
    Litigation
    Either Reclamation or USACE

  West Side Conveyance System ( mjbarkl.com/westside.pdf ):
    Raise Shasta, +2 MAF or 9.3 MAF, flood flows into West Side Conveyance System
    Intercept Clear Creek/Whiskeytown/Trinity exports
    Dams as part of the System on the forks of Cottonwood, Red Bank, Elder,
      and Thomes, +.5 ?
    Glenn Reservoir Complex, +9 to +12
    Trade Dos Rios for Hetch Hetchy, +7.6 - .36 ; 
    Sites, +1.9, below Sites, link to :
    Expand and merge Glenn-Colusa and Tehama Colusa Canals , extend to
      Rio Vista with siphons across the Sacramento and San Joaquin to
      Bethany Reservoir; link Cross-Valley Canal from Thermalito to
      Glenn-Colusa; enlarge Glenn-Colusa; line Glenn-Colusa, +.125
    Berryessa expansion, +?
    Oristimba Reservoir +2, Los Banos Grande Reservoir +2,
      Enlarged San Luis +.13, Del Puerto Canyon +1, Garzas Creek +1

  Enlarge and Extend Folsom South Canal for flood flows, 
    Intercept flood flows from forebays at Dry Creek, Cosumnes, Mokelumne,
      & Calaveras
    Extend past Stockton & across south end of Delta to Bethany,
    Add a smaller Auburn Dam for flood flows, +1, Marysville Dam, +1
  Add 5.5 MAF additional flood control storage on the Tuolumne & Stanislaus
  Add Temperance Flat, +2.5 &  Rodgers Crossing Reservoir +1
  Research on reducing evaporation losses, ??

Total added storage, 37.14 - 45+ MAF ; portion to handle CV floods, 31?

Replace Southern California Colorado River water with these sources.
Supplement Nevada and Arizona water with these sources.
Enhance aqueducts to Southern California.

Major funding:  Flood Control plus trades with AZ & NV