I just wanted to say that you didn't include the price of the Western Digital 1Tb drive.
I would definitely choose 16GB over 8GB of RAM. I used to have 8, but after upgrading to 16, I would definitely do it again. Boot up times are shorter, programs load faster, everything speeds up.
I use it too, but Noctua seems to be the best in the field.I'd change the CPU cooler to a CM 212 evo. I have one on my i5 and it does the job nicely. It's tall so make sure it has room in the case before buying it.
Cooler Master: Hyper 212 EVO