My vote is a 7D with a 24-105. You get the durability you need and a comfortable range + a familiar feel and high FPS when needed. The IQ is there provided your not shooting 50% of the time in a dark bar. Put a rapid strap on it and go sans case.
This is an interesting thread in terms of what we think of as a "travel" camera. To me having a 7D and 24-105 I would say that it's not that travel friendly. It's big and heavy plus 24mm isn't wide enough for me. So I'd have to take my 17-40 too. I think there wouldn't be much of a difference in "discreetness" between a 1Dx and 7D. Yes it's smaller but overall they're both bulky. In a dodgy area theives will easily make you out with your 7D. Maybe another DSLR is not the answer. Sounds like OP wants something pocketable.
Either go small or go with what you have. No point in buying something halfway.