Go with a better grade power supply and add a ssd for a boot drive. Corsair, Seasonic, or Antec are good power supplies, Samsung or Crucial are good SSDs.
It would be about 950 with the battery and extra 4gb ram, But thanks! This site seem really neat and helpful. One thing i like about Amazon though is they have a finance option.