I'm with Mazer and the others that suggest replacing your main speakers. I just question your choice on the M80s. Have you heard them or have a chance to hear them? The point I'm trying to make is go out and audition as many speakers as you can before deciding on which pair to buy. The Axioms are good speakers but they may not be the speaker for you. By auditioning many brands, you'll get an idea of what kind of sound you like/dislike etc and then you can narrow down your choices. Speakers to audition are PSB, Paradigm, Polk, Boston Acoustic, Totem, Mirage, Energy, Kliptsch, Sinclair, Athena, ProLinear.
Figure out the sound from them and if you want to go ID, then people eho have more experience here with ID speakers can point you to the offerings made by these companies should you choose to go this route.