Your Yamaha isn't much different than my low-end Denon. Actually, it's dynamic rating is higher than my Denon. You should be pretty happy with it as it provides you with more than enough power.
I wouldn't spend any more money on the 2-channel rig. Save up and buy an EP600 instead .
I am curious how you like the Wharfedales in comparison to the Axioms.