what to do?

I can't figure out what direction to go. I am trying to upgrade a dual HT/music system. I want to get the best sound(music)I can without losing the 5.1 HT ability.

I have planned on getting a 2-channel tube pre (Rogue 99 w/ HT bypass or Marsh p2000t) with a 2-channel SS amp and 3-channel SS amp, and using my Yamaha RXV-995 AV receiver as the HT processor.

Now I'm wondering if I should:

1. Get a very good HT pre and use my receiver's amp.
2. Sell the receiver, get a good HT pre and a decent multi-channel amp, or a 2-channel amp and a 3-channel amp.
3. use the receiver as a pre/processor and get very good amps (tube or SS).

Total budget $2500-$3000 USED.

My source will most likely a good DVD/SACD player such as the Denon 2900, but that is not part of the above budget.

Speakers are all Soliloquy.