I've actually decided to go another route, I am going to sell the psbs and Yamaha, so 've the yammie is a bit dated and the psbs are so fussy,
I have a nice JVC digifine series stack paired with JBL L100Ts And am going to continue using my sony avr with smaller surround speakers (paradjgm) and a psb sub for movies and gaming.