Looks like I am coming down to two choices.

1) Keep the 787 and get a P500 to drive the M80's.
2) Ditch the 787 and get the new Marantz 7300 receiver.

Both options will probally cost me the same amount of coin ($500, as I have a buyer for the 787). Just wondering what will give me best bang for the buck when listening to 2 channel music.