At this point, after reading many replies, doing further research, and hitting the local Best Buy again to listen to multiple receivers, I've narrowed it down to keeping the Marantz 5011 or getting the Yamaha RX-A1060 (which currently is heavily discounted at my local BB). I was going to post a new thread to get thoughts on these 2, head to head.
Thanks for everyone's feedback.