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.

indranilsen
@jwincville- I listened to the Rockport Atria-II speakers a few times in the last 2 weeks and I am still not very convinced that it is worth replacing the Aerial 7Ts. So I am not going for this upgrade immediately. If I change my mind I will definitely get in touch with you.
@soix- I love the sound-staging and the overall balance of Aerial 7Ts when it delivers music. I am looking for a better quality mid range reproduction (in addition to the balance, sound-staging) as part of the next speaker upgrade. Atria-II is better but I didn't feel the urge to move immediately and replace the Aerials. 
Meridian dsp 7200se, buy used and pocket the change. At least get a listen so you understand what you give up with passives. D&D, KII3, Genelec. Just demo any dsp active, I picked M because they've been doing it longest and used prices are a steal, but the sound is so room friendly I can't imagine anything sounding better.
FOR $30,000 CONSIDER ATC SCM150 ACTIVES.
USE REST OF MONEY YOU WILL GET SELLING YOUR OTHER EQUIPMENT ON MORE RECORDS!
@steve59/@d2girls- Thanks for your suggestions. I have got zero experience with active speakers. I would try to audition them if they are available locally....
@luxmancl38-  I have recently spoken with Michael Kelly about his 20T replacement. It is still in the making and there is no date on the horizon. They would be likely priced at 40K which is beyond my current budget. But thanks for sharing this information.