best setup / hardware configuration for motion graphics

hello,

my PSU finally crapped out, or maybe together with my MoBo, waiting for multimiter and browsing the Interwebs for new exciting hardware.

My question to motion graphics pros here is what hardware setup would you recommend for optimal performance of Cinema4D r13 and Adobe Production suite CS5, which i'm planning to upgrade to CS6 soon.

Current setup:

Windows7 Ultimate, 64bit
Gygabite EX58-UD5 MoBo - might have to replace it
Intel Core i7-920 2.66GHz LGA 1366 130W Quad-Core Processor, currently discontinued on NewEgg.
Kingwin 730W PSU - most likely the root of my current computer problem. Not against upgrading to 850Wt PSU.
Nvidia Qaudro 4000 graphics card - pretty happy with it.
12 Gb of OCZ Reaper series tripple channel RAM - not opposed to the idea of upgrading to 24
Dual monitor setup, main monitor is LaCie 324i, a power-hogging, graphics card melting jerk, but is a really good monitor otherwise.

OS, Adobe and Cinema4d reside on 120Gb OCZ SSD
2 mirrored (raid 1) 2Tb HDD for current work
2 1Td HDDs for libraries and other less important installs

So if you put together a workstation for AE/C4D work that you really happy with, i'd love to hear about it

thank you,
-Katya
:)