Hey guys,
Thanks for all the feedback.
I've made some changes to my built according to your advise (and to what Umart actually sells) and this what I ended up with: http://au.pcpartpicker.com/p/xDX9dC
In regards to the CPU and RAM I'd still rather go with the X99 and the 16GB because I do work from time to time on CAD and Photoshop. It's not very often, but it does happen (when I really can't avoid it).
Other than that I tried to follow what you guys said, despite limiting myself to Umart making it a bit hard.
Let me know what you think.