Brad, if you're happy, then why change anything? You have what appears to be a tremendous sounding system. At your current level, it is actually easier to screw-up your system then it is to make it better by substituting equipment. If you haven't already done it, you might want to invest in a serious equipment rack and try to address isolation issues.
Also, have you tried running the Wadia directly into the power amps?
