I got around $2000 to play with....

Wife has allowed me to spend around $2000 on speakers, CDP, and amp for our new house.

Details:

Medium sized room, mostly jazz, classical, and some old soul (I like the warm rich sound of my stax and atlantic cds).
I want to stick with solid-state for now. Will consider used for amp and CDP, but would like to get speakers new.

Here is what I am thinking from other research

Music Hall 25.2 amp and cdp ($550 each)
Monitor Audio RS6s ($1100)

What else would y'all recommend I look at?

Thanks!