Sounds like all you are missing is a pair of Druid Mk4 speakers 101db. -Perfect match with the 845.and can be put close to a wall.
For front end if you must change - great bluebook: Nad M55 dvd/audio/video/sacd/cd
And all under 5K
Upgrading integrated amp from SET integrated?