Well, I dunno... More likely here's what I'd do:
5DII or 6D for landscapes and aviation on ground. But it depends upon what you do with your images, whether or not FF would be all that useful. If you print big... really big... FF is great. If you don't, might not be all that much of a help. If you opt for FF, you'd need to rearrange some lenses to accomodate the FF for landscape. Maybe 17-40L?
7D or 60D for wildlife and aviation in flight shots. Or if you don't do a lot of landscape shots or don't print big, just 7D or 60D for all types of shots. 7D's AF is "1D Lite" (it essentially uses just the 19 cross type points, omits the 26 single axis points of the 1D series). In this case, I'd also suggest to keep the 10-22. Add the EF-S 15-85 if you wish to replace the 18-55, but I don't see it replacing the 10-22... There's a huge difference between 10mm and 15mm. You also could consider 28-135 IS as a mid-range zoom (good quality for the money, especially when bought used), or 24-105L, or 24-70L if you would find f2.8 useful. It's not like the wide end... the "gap" between 22mm and 24 or 28mm isn't a big deal. All these are full frame capable, too, if you ever add a FF camera. They'll work fine on your 1D too, if you keep it. On the other hand, the 15-85 is more compact.
You also could go FF only, with 5DIII for it's AF capabilities. You'd be giving up some reach with it, if you don't get something longer than your 100-400 for wildlife and in flight shots (anything longer is pretty pricey). It would mean replacing both your EF-S lenses, too.
You can install ML on 5DII, 7D or 60D right now. 5DIII ML is in initial testing stages, I believe. Won't be able to put ML on 6D initially, I'm sure... maybe eventually. Plus the new model is a bit of an unknown in some other respects (IQ, AF performance), until people actually get hold of a few and start using them in the real world.
