Guy, I'm sure that Axiom can accommodate you on a trade-up. I've been using the EP500 with my M22s for over two years now and the combination is superb for music, including pipe organ. For a lower price, but still a significant step up, you might consider the EP350.

-----------------------------------

Enjoy the music, not the equipment.