I'd definitely go for the XA-25 and live with that for a while in the current--nice--setup. Speakers might follow at some time in the future.
My understanding is that moderately easy to drive speakers, the '25 sounds better, or at least different, to .8-series amps.