Really need Amp advice.

I have a pair of BW 804 speakers and am running them off of an Onkyo Integra DTR 6.3--the reciever clobbers female vocals--almost too painful to listen to. I'm looking for a good pre-amp/amp combination to squeeze the maximum performance from the speakers in the most economical way ($2000). Ultimately, I'd like to have a HT capability, but critical listening will be 75% of the system's use. My question is: should I just scrap the Integra and pursue a separate pre-amp & amp(considering Parasound) or should I keep the Integra to use as a pre-amp/HT unit (considering Parasound HCA 1205, and bi-amping 4 of it's five channels)? I am getting buried in technical data and can't see the forrest--any help appreciated. Thanks!
JadeEye