I have a 5.1 surround system based on the B&W 600 Series 3 speakers (DM603 S3 front speakers, DM601 S3 rear speakers), which doubles up as my hi-fi.

However, I think my AV receiver is the "weak link", as music sounds lousy. I have a Yamaha RX-V630RDS.

Should I upgrade to a better AV amp (suggestions?), or should I dismantle the system, and pair-off the floorstanders with a purely audio amp (again, suggestions?, and get another pair of 601 S3s as front speakers for the home theatre system?

Please help!

What I have done is buy a separate cd player and stereo amp (the latest cyrus 8 series). Music sounds much better through these than my denon 3900 player and yamaha v4600 amp. However I can still play dvds/sacd through the av equipment because I have connected the av amp pre-outs front left and right into the new cyrus amp aux input. Best of both worlds for me and recommended.