Tube amplifier upgrade suggestions welcome.

I currently have a Musical Fidelity m2si and some Tekton Lore speakers and would like to buy a power amplifier to upgrade my system.  I'd like to keep the m2si in the system as a preamp.  I'd like more clarity, bass, and dynamics in my setup.  I have up to $2K to spend and thought I'd try out a tube amp since my speakers are supposed to be very tube-friendly.

I have considered something like a Parasound A23+ or Rotel 1582 amplifier -- what are the equivalent tube amplifiers to these?  I'm in an 11' x 12' room with horrible acoustics but I've treated it with 8 GIK 244 bass traps and have added an SVS-SB1000 to fill in the low end which helped a ton.  How should I proceed from here?