Integrated Amps with a Headphone Input

11-20-11: Houstonjazzfan
So would I be better off just adding a headphone amp to my system?
If you are mainly after a good headphone amp the answer is yes. There is no doubt that most suggestions above would better your old yammy as an amp/pre amp combo.

See my comment on the Portal Panache. Also the Leben has a really good internal headphone amp. Research those two, and see if they will work with the speakers and headphones you are using. Try the Headfi forum to look at headphone compatability.

Just wanted to update this thread. I ended up getting a Luxman 550 A II. I was a bit concerned about this 20 wpc Class A amp being able to drive the M30's, but it works spectacularly based on my listening level preferences. This Luxman is fantastic. Next step is to purchase a high-end headphone. The Audeze LCD-2 are on my wish list. Thanks everyone for your input.