Upgrade path
Fox,
I can attest that the Emotiva LPA-1 amp was an easily audible upgrade for driving my 4 ohm Onix Ref speakers.
Based on your sig, I don't see a bluray player, so no need for HDMI audio in the near future. Instead of buying a new Yamaha, get an emotiva amp. A few months from now when the pre-pro is avaialble, bugs are worked out, on sale, etc. you can upgrade to the pre-pro.
FYI, I plan to upgrade my Yamaha with one of the Emotiva pre-pros, but I expect less of an audible upgrade than when I added the amp.