There isn't a discernible difference between the 4690k and the Xeon except that the i5 overclocks a lot better than the Xeon, so I think you should stick with the 4690k. It seems like you've cut corners on the PSU, which I must oppose. Depending on your budget I'd recommend that you check out some PSUs by Seasonic, PC Power and Cooling and Super Flower.