for music if your speakers are capable of hitting somewhat low (unless you want to listen to a pipe organ hitting below 20hz

) then in my experience a nice amp is an awesome upgrade! But it really depends on our listening habits, and the type of music we listen too. I prefer easy listening music, jazz, acoustic guitar solos, and some classic rock. A sub for me doesnt really improve things much, but when adding an amp it took my sound to the next level.
Again this really does depend on the music you listen too and the SQ you prefer.
If you would have said your listening habits were 80%movies/ 20% music i would say "get the freaking sub!!! it will make your life complete!!!" lol. But if music is your main concern a good amp should never be overlooked. I've never really used a sub for music anyway though. It definately helps fill in the low end, but you can get a large improvement in clarity, soundstage, dynamics, bass, and overall enjoyment with an amp

.
Now the most important part of what i have to say is this all depends on your source! If your say using crappy MP3's to listen to music than an amp will only make things worse, and in this case i would definately recommend a sub. Remember an amp is amplifying the signal so it will only make crappy recordings sound worse for the most part, but can make an awesome recording sound like true beauty.