A fileserver of 4.2 TB in size drowned Zippy 650W power supply

The specification of fileserver:

• Supermicro PDSME Motherboard
  
• Intel Pentium-4 820 Dual Core / Dual 1MB L2 cache / 800 MHz FSB
• 4 x 1GB DDR2-533 (Transcend TS128MLQ64V5J)
• 2 x Promise SATAII-150SX8 Controller (8 SATA ports each)
  
• 16 x 3.5" Seagate 7200rpm 300GB SATA HDD with 8MB cache (ST3300831AS)
• 2 x 2.5" Seagate 5400rpm 80GB SATA HDD with 8MB cache (ST98823AS)
• 1 x Intel Pro/1000MT Dual Port Gigabit Controller (PWLA8492MT)
• 1 x Intel Pro/100M Single Port FastEthernet Controller (PILA8460M)

The 650W power supply (P2L-6650P, +12V=34A, +5V=40A) chocked with only the above four items in red installed. I had to detatch 4 HDs to make the CPU fan spin.

Changing to one of the following is under consideration:

• P2M6600P(600W) +12V=42A +5V=35A
• P2M6601P(600W) +12V=48A +5V=30A
• H3M6600P(600W) +12V=48A +5V=30A