Thanks guys.
I'm pretty happy with it. The only changes I've been thinking are some different speakers (even considering going back to Maggies, now that I have the power), and maybe going back to a really good CD based system rather than the computer music server (gasp!).
The amp is staying, though.