Joilda or Music Hall for Hybrid Amp?

I have a Jolida 1501 integrated hybrid amp (solid state amp/tube pre-amb/100 watts/ch) and I am looking for a good match for a CD player. I liked the amp because I will use it with monitors and I wanted as clean and punchy as bass as possible, but I also like the smooth highs and midrange. I have only had the amp a week (Underwood Hi Fi) but it seems very clear and solid.

I am now looking for a CD player. I am considering buying either the Music Hall CD-25 or the Jolida 100a. The Jolida has tubes that I thought would further smooth the sound and gets very strong reviews (but costs several hundred dollars more). However, I was wondering if this is too good of a CD to match with the amp, i.e. am I putting my money in the wrong place by spending so much on the CD player. I can’t afford anything more than the Jolida, and even that is a stretch but I thought it might be worth it to get the source sound as good as possible.

Also, the Music Hall has an HDCD chip and the Jolida does not.

I am currently running the system with an old pair of Klipsch floorstanders but we are moving and I will switch to bookshelf monitors. At the top of my list is the Von Schwiekert VR-1s, which I hope to listen to when I’m in California over the holidays. I listen to rock (Grateful Dead, Clapton, Cowboy Junkies), jazz (Coletrane, Armstrong) and some chamber music.

Any recommendations?

Thanks, David