If I were you, I'd keep the amp (those two amps won't be much better than PM6004, if at all) and buy some new, punchier speakers. I'm also looking to get news speakers and so far, I liked the ones below.
My suggestions:
1- B&W 685 S2: new model, warm and exciting sound, deep bass
2- Monitor...