I'm afraid the upgrade of 1DXs needs more time. Someone on Canon rumors said that 7D's upgradtion would be announced in a short time, but the level is CR1, which is unbelieveable. Maybe we can expect it later this year?
Your Budget? Moon is easy for shooting when you have a long zoom lens. It has less needs to the camera body. For action photography, it ask more about the camera body, maybe the Canon 7D or 1DX is a good choice.