Amp upgrade suggestions for a $2K budget


Hi guys,
I'd like to upgrade my equipment. I listen mostly to jazz and classic rock. currently have B&W CM7 speakers, a Rotel 1062 integrated with a Rotel 1072 CD player, Clearaudio Performance turntable, clearaudio carbon fiber tonearm, Benz L2 cartdrige and Moon LP3 phono preamp. I find that the Rotel soundstage lacks depth and separation. I added a Grant Fidelity tube buffer in hopes of improving it, but did not hear a great change. My preference would be to get a MacIntosh 6900 integrated but can't afford it at the moment. is there another integrated that would fit my budget and sound comparable or maybe even a tube preamp + power amp combination you'd suggest? btw, I'm fine with getting something in the used market.
thanks, Herbet
herbet