CDP or Transport and DAC? Recomendations?

Current setup:

Rega Apollo CDP

BlueSound Node 2i

Rega P6 TT (upgrading to P8 after 1st of 2022, when I can hopefully find a new one) 

Rogers High Fidelity KWM88 Integrated

Tekton Moab

Looking for advice on a CD upgrade. Budget around $5000. Want new equipment. Is it better to look at a separate transport/dac or a cdp in that price range? What are your recomendations?

Have around 3000 cd’s dating back to the mid 80’s when cd’s first came out. Have SACD’s as well as burned cdr’s.  Need to play everything.

The Audiogon members are always the most helpful and I appreciate your time/thoughts.

Thanks