This headphone has pretty much everything you are asking for. Should be a pretty drastic improvement in sound quality over those AE2i.
Another headphone that fits is the Sennheiser MM550 which is available refurbished if you search. Pricey new.
Personally I would just get some in ear headphones with good foam tips that seal off the outside noise. That's called isolation.
The Westone 4, Shure 535, Heir 4ai, and the new UE900 are ALL going to sound great and you will be VERY happy. You should just read reviews for each one and see which one seems to match the sound you would like most.