I would like to start off by saying that there's nothing just inherently wrong with the build you listed here, it will work as is. That being said though there is still considerable room for improvement and you really should state your budget so we know what to work with.
First, the CPU. If you ever plan on overclocking (you said "could be") you need to get a CPU with a K designation, which means the CPU has an unlocked multiplier. As it happens, the 2500k is only $10 on Newegg than the base 2500. I highly suggest just getting the 2500k to keep the overclocking road open.
Second, your GPU. The AMD 6790 is priced about roughly the same and will outperform it.