I use it prob 80% music 20 % movies.Considering that this is almost full time music listening, and part time movie watching, I would focus entirely on upgrading for music. Assuming music listening is stereo only, options could be,
1) Add a quality stereo preamp with a HT bypass to mate with the B&K amp
2) Sell the B&K and use a quality integrated amp with HT bypass
3) For CD listening, possible upgrade for the Cambridge
Now if your music listening includes all speakers, the above would not apply. So, if you care to provide more info about how you listen to music, strengths and weaknesses of current sound, it would be very helpful for recommendations.