Hello, I know how hard it is to make a decision on a PSU, I just picked up a Corsair 850HX. One thing to keep in mind though is that you can have too little power but theres no such thing as having too much (well I think in the US a wall socket can handle ~1200w PSU from what I've heard) On that note from looking at what you have listed you should be just fine with the PSU you have.
For when you do start looking for your new PSU here are a few links that I have saved while looking for my own to power an i7 machine. I would suggest IMHO from the research I have done and PSU's I've owned that in no particular order: Antec, Corsair, Seagate, and PC Power & Cooling(now owned by OCZ) just as others here have said, have some of the very best PSU's made, along with great warranties.
Here are a few VERY good review sites that you may want to check out before making a decision:
Thumb rule would be to stick to Corsair, Seasonic or Antec in that order.
I prefer the following order...
#1. Seasonic - basically the premier PSU manufacturer
#2. XFX - because all their PSUs are manufactured by Seasonic
#3. Corsair - because only some of their PSU are manufactured by Seasonic. The others are manufactured by CWT. They are shifting more business to CWT to cut down on costs.
#4. PC Power & Cooling - because some of thier PSUs are made by Seasonic.
#5. Antec - because some of their PSU are made by Seasonic, however they are known for cutting corners to reduce cost. Not the same top notch PSU quality they were known for several years ago.