Upgrading Aerial Acoustics Model 7T

Hello,
I am thinking of upgrading my Aerial Acoustics Model 7T. Here the two speaker choices, not in any order, that I have so far
1. Rockport Atria-II
2. Magico S3 Mk II
My music room is relatively small (12' X 16' X 7'4") and it has acoustic treatments, primarily GIK Acoustics panels, on the walls/corners. My budget is 30K. I have listened to both Atria-II and Avior-II in a local dealer's hi-fi room and liked the Rockport house sound. I would have preferred the Avior-II if I had a little bigger room but for now I decided to shortlist Atria-II. I am going to listen to the Magico's shortly. I listen to all sorts of music but really love male/female vocals and Jazz. Currently I am using Parasound Pre and power amplifier to drive the Model 7Ts but I am planning to go pure Class A, balanced (both input and the circuit) instead of Class A/B design. Would love to hear your comments on my choice of speakers and any other brands that would suit my budget, room and listening preference.
Thanks.