I would vote for the amp, for several reasons. I'm not impressed with that amp. Plus I think you will experience greater improvement in your system by upgrading closer to the source. I checked out your system, and think replacing the PS Audio would give the biggest bang for the buck.
Let us know what you decided to do after all.
Let us know what you decided to do after all.