Are you still gonna replace that Premiere PSU? You should.
Since it sounds like you're going to build a second computer, what kind of budget are you working with?
You use PhotoShop alot? My suggestion is to get the fastest CPU you can afford. Photo work takes mucho processing cycles and having a really fast CPU will help there.
Cricket