If you buy into the new x99 platform you are being screwed over by the fact, that it does not support ddr3, but requires ddr4.
Except one sale, by Asus I believe, two weeks ago, ddr4 is painfully expensive, while not really benefitting our work at all.
If you want to upgrade, I would recommend going all the way Xeon future proof, others know about Xeon price vs performance way better though.
Personally I would wait till Zen vs 7xxx, since after the 6k series we will have a dye shrink, prices might drop, not for xeons though...
Lastly, if you consider upgrading graphics card for whatever reason, I strongly suggest not buying Quadros, if you can get around compatibility with your workflow. The price is just too painful and double precision is not needed outside of scientific calculation. They simply disables the double precision microcode on geforce cards and want silly amounts of money for "professional" tier cards.