I wouldn't get rid of the M504. Find someone who can work on electronics, swap out some of the power capacitors and enjoy the Honking Onkyo Integra. It's a great amp, and its huge power meters are downright beautiful at night.

Enjoy the Music. Trust your ears. Laugh at Folks Who Claim to Know it All.