I was right where you are. I went with B&W N802s and I thought they were a great improvement, since then, I went from Bryston 4B-ST to Roland M201 and this also enhanced my sound. Either way, there was an improvement. I think the speakers were more but since I sold the older B&Ws I can't be sure. I think the good thing about the N802s, they hold their value like the Bryston amps so you will be fine if you move in a differnt direction.