To make a long story short since I'm on my phone...

Build a new rig

I was in the same boat 2 yrs ago and just decided to build one instead of upgrade and it was the best decision hands down.