How about a 5DIII and a 300/2.8L IS II?
sounds like you want to splurge a little on the 1DX (which I think is totally fine if you have the money for it). If you want an immediate upgrade, I think the mk3 would make you happy too....I'd get the mk3 and the 300 2.8 IS II and save up for a 1DX AS WELL! =) happy shopping.
btw, get the wife a little something that she would like while you're at it.