Downgrade the PSU to 500W~550W and another brand like EVGA b2 Supernova or XFX (TS/ProSeries) or Seasonic.
Also, i would downgrade the HDD to a blue (note, search model X, they run at 7200RPM, Z series are a mix of blue and green and works at 5400RPM).
How much $ do you have to spend?