I think you can down size and still go with seperates and still stay in your budget. I'm not that familiar with your gear but judging by your choices you might like the (all used) better C-J solid state seperates or the better Electrocompaniet integrated.
Downsizing advice
I'm currently running an Air Tight ATC1, c-j Premiere 11A, pre power combo and I am considering downsizing due to financial reasons. That being said, I still want to have a great sounding stereo. Any recommendations on a great sounding integrated in the $2.5-3K range. Tube or solid state, it should be able to drive my Sonus Faber Grand Pianos. Suggestions welcome.