How often do you upgrade? For me, I want the best hardware I can have all the time. I upgrade my cpu, vid card, ram, and mobo once a year. Although you may not be hardcore like that, if you plan to upgrade in two years, I would not go with Intel or Nvidia, I would go with AMD and ATI. For the same performance you can save hundreds.
Although, if you overclock stick with what you have, their have more hardy hardware. You live in Cali in a place where power outages are not too common I imagine, whereas my power goes out all the time in the winter. You don't really need hardy hardware unless you lan a lot, overclock, or don't plan on upgrading for around 5 years.
Other than that, everything looks good. A trick to getting 2 TB of harddrive space with $200. Buy a Western Digital externail Harddrive, the ones as thick as books. Break it apart, and put that 1TB 7200 RPM SATA drive into your computer. It's nice.