Upgrading Aerial Acoustics Model 7T

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.

I heard the Atria IIs at a local shop while comparing two network streamers and prefer my 7Ts; but this was not an apples to apples comparison. Different electronics, different room etc..
@Chilehed- Thanks for your reply. Aerial 7T indeed is a great speaker and I can easily live with that. The room is so important that sometimes these evaluation sessions at different rooms could be very misleading. I heard Atria II in a relatively bigger room, wonderfully treated, and with much more expensive electronics that I have. I thought Atria's presentation had more meat and the voice did sound relatively better than the Ariel 7Ts but again I have to listen them in my room before making a final decision. 
I took the liberty to view your room and the system. It is really wonderful. How do you like Pass Labs driving the 7Ts? Another question on the speaker placement. From the picture it seems that the Aerial 7Ts are relatively close to the wall behind them. Just curious, are you able to get full the depth with your current set up?

Hi @indranilsen,
 I heard the Atria's in a very nice room and they were driven by an Innuos streamer, DCS Bartok DAC and the smaller Gryphon integrated amp. I was actually surprised by how similar that system sounded to mine in terms of dynamics. I didn't sense any more "meat" with the Atria's but the sound stage was decidedly different. The Atria's presentation was very well defined but narrow while the 7Ts at home throw a slightly less etched but much wider image; depth was excellent and about the same. Again, with so many variables, (different room, different electronics) I'm not sure how useful this info is for you and yes, I'd think a home demo is a must given the Atria's are 2.5x the cost of the Aerials.
The 7Ts sound great when driven by the Pass but it is not significantly different than the Parasound A21 which I have heard driving the 7Ts many times. As a point of interest, the biggest game-changer for me was when I added the Backert preamp; putting that in my system was like getting hit with a bolt of lightening! Then, when I upgraded from the Bluesound internal DAC to the Benchmark was another significant and immediately noticeable step up.
In regards to my setup, the distance between the back of the speaker and front wall is about ~33 inches, the front of the speaker is ~4' from the front wall. When you ask if I am getting "full depth" I assume you are asking if I am satisfied with the bass response? And I would say yes, based on what I hear the 7Ts produce from well recorded tracks I am. 
Good luck.
@Chilehed- Thanks for your detailed response. In fact I listened to Atria-II with DCS Rossini Rossini DAC driven by Gryphon integrated amplifier in Goodwins High End audio showroom in Waltham-MA. Yes I will audition Atria -II in my room before making the final decision. 
On the speaker positioning topic and by depth I mean, are you getting the image way back on the wall behind the speakers being completely detached from them. The only way I get that in my room is leaving around 5' distance measured from the front of the speakers. But you are close and it should be good.