As somebody who designs and builds high-end PCs for a living, I highly recommend leaving the upgrading of your current computer as a separate issue and simply building a new PC from the ground up. You’ll save money in the long run and you’ll have the PC you really want instead of building around obsolete parts (including chassis and PSU, which are relatively inexpensive). That way you’ll have two working systems for the price of one.
