Good upgrade path from 20D and 1DMkII ?

I still really like my 20D,and the well used my fairly newly aquired 1DMkII.
I like to shoot land and seascapes, as well as wildlife and Birds in Flight, as well as aviation and classic cars.
I have a 70-200 and 100-400, as well as a 100Macro, and 10-22 which I rarely use, mostly using a 2nd generation 18-55IS kit lens.
I would like to get a camera that does everything well, and was thinking of a 1DMkIII. I don't have a lot of great glass, although eventuallyI would like to get a 400 5.6 and a good general all around lens like a 15-85IS.
Is it possible to get a camera that covers what I shoot and do it well, and what would be my options?
I don't have a huge budget, and was really hoping that the newer version of the 7DII or evn 70D might come out, but I think Full frame is out as I lose the crop factor for my longer lenses.
Suggestions ?

Biased, but I'd say grab a 1D3 until the 7D2/70D thing is sorted, then sell if you want to make a switch. It likely won't depreciate too much between now and the end of the year (maybe $150?). So it would cost you less than $20/month

The 15-85 is EF-S and won't work on anything but the 1.6x crops. I have the 24-105 f/4.0L IS for very similar focal length coverage, and it's a wonderfully sharp lens, and a good value at ~$700 used.