You might consider trying some MIT or Audioquest speaker cables. Both go a long way (in most cases) to eliminating the bright top end that is bothering you right now. I think McIntosh is a great match for B&W, but probably not in your price range right now. I did see an MC502 amp for sale on A'gon for $400 with a case. If the aesthetics don't bother you, give it a try - tough to lose money on McIntosh stuff too. I have also found the Kimber Kable ic's and speaker wire to be exceptional. The 4TC and PBJ's are great, economical choices. They seem to be on the opposite end of the technological spectrum compared to AQ or MIT, but the results are impressive indeed. Good luck and enjoy!
One last note - A while back I read an article detailing an economical system that promised to deliver the goods. It consisted of Antique Sound Labs Wave amps (8 watt models) modified with Auricaps, and ASL preamp (currently $249), Paradigm Atom speakers and I think a Sony source. Total cost with mods was $1000. The amps are no longer in production, but you can pick them up here for about $300. Everything else is either in production or readily available on A'gon.