I'd rather limit it to a total spend of £2.5K if I'm honest, I'd be happy to ditch the 10-22, the equivalent L lens is a similar price to what I paid for the 10-22 and they still fetch decent money so not too bothered about lenses. The 17-85 can hang, I never use it.
I would miss the buffer, speed and build quality of the 7D which is why I'm not looking at the 70/80/6.
I kinda agree about the 5D4 but it'll cost a load when new and is a few months off yet, meanwhile I'm stuck with a poorly 7D