I have a Ref CD7 and it is an excellent CD player. If it were me I would buy a CD7 and sell the DAC. Make sure it has the power supply upgrade. The CD3 mk2 is a nice player but not in the same league as the CD7. The problem with the CDT, CD1, or CD2 is availability of replacement parts for the drive mechanism.
I would also consider changing out the amp. I auditioned the CJ Evolution 2000 many years ago when it first came out. It was my least favorite of all the amps I auditioned at that time. I ended up buying an Audio Research Classic 60.