Two thoughts - one on the CD and one on the amp. Obviously my recommendations are HIGHLY influenced by what I have, but in this case that may not be all bad. I too had an Arcam (and still have an Arcam MCD 6 disk changer).
Amp first - because I agree with the thought to first look at that upgrade to higher power. I have an EAD PowerMaster 2000 which is truly incredible. It is built like a tank and has more than enough (WAY more than enough) power - and even more with the 20 am upgrade - to mate well with your speakers. I've had this for almost 4 years and I've given no thought to upgrading (other tham to Lamm's to mate better with my Lamm L1 for stereo)
CD Player - I use both the Arcam CD Changer mated to an EAD TheaterMaster Pre-Pro and an Electrocompaniet EMC-1UP mated to the Lamm L1. Both are powered by the EAD PowerMaster and I can tell you that for some serious "get into the music" listening the Electrocompanient, Lamm, EAD combination is stunning as compared to the Arcam, EAD, EAD combination. This is not to say that the Arcam is bad but it is definitely more analytical and less involving.
Obviously I'm not comparing apples to apples because the Lamm is in another league compared to the EAD pre-pro. But I have hooked up both CDs to the Lamm to do some mild A/B testing and the warm analog-like (to use an overused cliche) sound of the Electrocompaniet may be your ticket
Regardless, I would go amp first.
Good luck
Amp first - because I agree with the thought to first look at that upgrade to higher power. I have an EAD PowerMaster 2000 which is truly incredible. It is built like a tank and has more than enough (WAY more than enough) power - and even more with the 20 am upgrade - to mate well with your speakers. I've had this for almost 4 years and I've given no thought to upgrading (other tham to Lamm's to mate better with my Lamm L1 for stereo)
CD Player - I use both the Arcam CD Changer mated to an EAD TheaterMaster Pre-Pro and an Electrocompaniet EMC-1UP mated to the Lamm L1. Both are powered by the EAD PowerMaster and I can tell you that for some serious "get into the music" listening the Electrocompanient, Lamm, EAD combination is stunning as compared to the Arcam, EAD, EAD combination. This is not to say that the Arcam is bad but it is definitely more analytical and less involving.
Obviously I'm not comparing apples to apples because the Lamm is in another league compared to the EAD pre-pro. But I have hooked up both CDs to the Lamm to do some mild A/B testing and the warm analog-like (to use an overused cliche) sound of the Electrocompaniet may be your ticket
Regardless, I would go amp first.
Good luck