With the speakers you have I would suggest you also consider different amp/electronics.
I know there is a fervent following of McIntosh electronics but compared to other electronics in the same price range Macintosh equip does not have the inner detail that your sonus fabers are capable off reproducing.