Using a good preamp with headphone amp worth it?

I have a small headphone setup for use when I can't use my main rig, but I'm finding that I'm using the headphone rig more and more. In this system I'm using a small passive preamp because I have more than one source and I also share it with a small self-powered sub/sat set. The preamp is fine, but it's not as good as going direct from source to headphone amp. The headphone amp is a good one -- the Grace 901 -- and my headphones are very good as well (Sennheiser HD600s and Audio technica W1000s). I also have a backup Stax set-up that I had packed up to sell, but put back just to be sure I want to do that. I run the headphone amp through the tape out on the passive. My passive has two pairs of outputs, but using the tape out avoids having two volume controls in the signal path.

Here's my question: In this case, would using a high-quality active (possibly tube) preamp be worth it? When using the tape out is the electronics of the preamp bypassed (especially with tubes)? In other words, is it not worth it to have a high-quality preamp if the source signal passes through the tape loop and into the headphone amp? If I were to use an output instead of the tape loop is having two volume controls in the signal path going to negate any added benefit of having a high-quality preamp (the Grace has a very high-quality volume control)?

The preamp currently serves primarily as a source selector, but it also serves as the volume control for the sub/sat system (which is of decent quality, but certainly not hi-fi). Someday, I may consider using a pair of small "bookshelf" speakers instead of the sub/sat (adding a power amp of course), but I think my wife will continue to prefer the diminutive apppearance of the sub/sat).

If you have any recomendations for preamps, here are my needs:
* at least 3 sources
* tape out
* preferably 2 outputs (to power amps)
* prefer diminutive appearance -- small and/or low height

OK in your case I can clearly see that DIY will be the best option for you.
1. You won't need any active preamplification if you're going to be only dealing with headphone amp.
2. All you realy need is input selector with no volume control.
3. A god quality selector switch for pennies you can get from, Gold-plated RCA jacks and knobs you can get at RadioShack or order from neccessary have to be Cardas or WBT). Chassis in this case is any you can think of for your convenience and budget.
4. All you realy need is 20...30W soldering iron, scredriver, drill and step-up drilling tool(to drill holes in chassis)
5. The easiest way ever is to simply implement a switch on your passive preamp that will completely disconnect a volume control making your passive preamp as input selector only. Use this switch always on if used with power amplifiers!
6. On the same passive preamp you can implement a switchable bypass output(i.e. add extra output and extra pair of RCA jacks or XLR whichever applicable) that will give you a possibility not to reconnect headphone amp with power amp every time and will be working as input selector or passive preamp just as in para-5.
7. If you're not DIY than you can simply order parts and pay-off a technician who will implement these mods to your amp real fast.
Stick with passive, the little Creek preamp comes close to your needs and has remote control, but only one set of amp outputs in addition to the tape outs so you would have to use simple RCA splitter plugs to get the two sets of outputs. Otherwise it is a no brainer, very small both in terms of physical dimensions and signal path. Lots of money left over for music too.