I would switch to 2x8GB because that leaves room for upgrade in the future, and just because it is an after market cooler doesn't inherently make it better. So the Evo, like metioned above, would be my recommendation.
Just remember at the end it's your cash and you need to decide on what best suites your needs. Many people may sway you on what they believe you should have but ultimately it's your decision. For example, you could plan a max budget of $1,700 but then find that, after everyone has voiced their recommendations, you end up spending, say, $2,000. Just thought I would tell you this as I believe it's needed.NOTE TO EVERYONE ELSE
Please don't go hating on me or reporting me because you don't like what I said, please.
Thanks for the idea and being the first to comment! I do like the pricing and the components, as you can see I edited the storage options out and I am now open for suggestions. But so far your build wins by default until a better one comes along(if one does) again thanks for the help!