2TB FOR $120 or 1TB for $60. Both plug right in. What resolution do you use for gaming? The 2060 doesn't totally suck, my wife still uses one. 5800X3D would definitely be an upgrade if it works in your board. I would upgrade PSU before upgrading video card. 80 plus white is not even really an efficiency standard.