Have you looked at the Rebel T6s? This looks like a really good option and keep all you favorite gear.
Or what about the Canon EOS M-series?