Rot this is probably an easy decision to upgrade the source. Although you don't mention your specific amp, realize that your downline components depend upon a quality upline signal in order to really perform. A quality amp + speakers is still no better than the (marginal) source that drives them. So start at the beginning. The room can wait (unless of course you have some major issues in that regard).
Case in point: I use a $10K pre to drive a $6K amp + $4.5K speakers.
Case in point: I use a $10K pre to drive a $6K amp + $4.5K speakers.