Speakers or Amp

My current amp is a Jeff Rowland Continuum S2 Integrated amp. My current speakers are Aerial 7ts. I have an opportunity to change one or the other. I can go from the Continuum S2 to the JR 625 mk2 with the Capri 2 preamp or from Aerial 7Ts to Raidho C3.1s. for about the same cost. I'm try to improve spacing between instruments and add a little more air. Looking for feedback from anyone familiar with the aforementioned components or general thoughts regarding the best option.