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
Interested in possibly purchasing your 7Ts.  I may be selling my 10ts as I just feel the need for a change. 
He doesn't have the speakers. He's just using the ad to get back at Michael. That ad has been out for about three years. Not realistic that those speakers would be available that long.
@luxmancl38- If that is the case then why wouldn't the Audiogon admin jump in and clean up those spurious ads? It is creating a very unhealthy environment and possibly hurting the image of this forum. 
@luxmancl38- If that is the case then why wouldn't the Audiogon admin jump in and clean up those spurious ads? It is creating a very unhealthy environment and possibly hurting the image of this forum. 
It is hard to beat aerial acoustics 7T, with any of the speakers you mentioned. 7T are the "best speakers no one has heard". I had auditioned quite a lot of speakers in 7Ts range (and higher range, up to 25K) and was blown away by 7T. I am glad I brought 7t. The only other speaker that came close to this was Audiosolutions Figaro L and XL (Unfortunately, not many have heard this too). I think, as long as your room size remains same, try not to change the speakers. May be change the amplifier to get a change. These speakers are keepers. You might regret it selling and spending > 3 times the cost of 7t. 
If your room size is big, may be Rockport Avior. 
Yes, the ad mentioned above is a spam. It has been there forever. Thank god, I saw a new ad for 7T and bought right away. Very hard to see 7t for sale on used market. That tells a lot.