Lak has a great suggestion, and I would add the Luminous Audio AXIOM passive pre which is only $125 to your list of candidates.
It only has provisions for one source, but it will let you know what your system sounds like without the Yamaha in the mix.
It only has provisions for one source, but it will let you know what your system sounds like without the Yamaha in the mix.