Xander,
You should consider another path no one has mentioned yet, which is the array integrated or partially integrated systems. I am talking about the KEF integrated speakers such as LSX for the new LS 60. There is also highly acclaimed Kii three system and an array of powered monitors out there such as the Genelec monitors. There are lots of good arguments about why these systems offer synergy not possible with separate boxes. Some reviewers that I respect have suggested that if their business was not reviewing individual pieces of equipment they would be very happy with an integrated system so they could stop focusing on Equipment and just enjoy the music. Integrated systems also are a big plus in small listening area because of the obvious space-saving. The last thing I will mention that you might want to be on the lookout for quality digital signal processing that can be added into your system. It helps compensate for the room and can make a bigger difference then the marginal upgrades in things.