Excellent suggestion by Realhifi on the Linn Akurate 242's. At $3,500 they are an incredible value, way underrated. Like the OP, I listen to a lot of classic rock (among lots of other music) with great results through the Akurate 212's (i.e., the 242's little brother) paired with a JL Audio F112. Even though the 242 carries the extra 6-inch driver, given your rock preferences, I suggest adding a sub to them as well, which should easily fit your budget. By comparison to your n804's, the 242's with a good sub, will leave you grinning ear to ear -- having made a very substantial upgrade.