Did you also remember to spec the newer G0 stepping Q6600 if not then that is another 30W you can take off as the new one runs at 95w while the older revision ran at 125W.
Either way that PSU should be sufficient but as you appear to be really thinking about it a lot I would probably get a different one then at least your mind would be at rest
As I suggested before the Corsair VX or HX ranges are good and come with a 5 year warranty the HX have the advantage of being modular which is advantageous in a smaller case but they are more expensive, as a result. Also worth noting that if you get 25 posts on here then you can get free delivery on orders from Scan so that will reduce the cost a bit