Evolving your two channel over the long haul sounds like the smart way to go. You might think about another amplifier and a two channel pre with pass through. These don't need to cost a great deal to achieve that delicate two channel sound. If your speakers have the powered subs you might think about tubes.
You'll find people with more receiver experiences over at the AV forum.
You'll find people with more receiver experiences over at the AV forum.