Forget about both for now. Get EVERYTHING out. The point is that you have not addressed the power delivery/noise control department. Audio is mainly about power, vibration control & acoustics. You need to work one at a time. Power is relatively straightforward (I'm lying) and acoustics can be dealt mas o menos. Go to http://www.decware.com and the Rives forum in the Asylum. Catch up on the acoustics subject.
High end is who you are, not what you buy.
***
High end is who you are, not what you buy.
***