805C - is this a good amp to get now?

I've read much about this amp and it seems to garner good reviews. My question is that is this still a good amp to get now?

I have a Plinius SA102 amp and was looking to get into another level in terms of amplification and was wondering if this would be a good move or a lateral one...?

I am powering a pair of Martin Logan Summits.

Also, what about the 805AE? Is that worth the extra cash? I know the AE can use the 211 (which doesn't concern me at the moment) but what does is the fact that the AE has a different front end - 2 6sn7 input/buffer tubes instead of the single 6sl7 on the 805C.

So the questions boil down to this:
1. Should I get the 805C (with upgraded oil caps)?
2. Should I wait or spend more for the 805AE?

Thanks!