Just to clarify.
The only thing I recommend is a better PSU, future-proofing and I think that's a little weak for your build.
This.
If you can afford it, or rather you WANT to afford it.
Otherwise something like:
This.
This.
This.
Or this. (cheapest)