Given the 7D has moved up to directly attack the D300s, perhaps a 60D with tilting screen would be ideal to target the Sony A5xx which so far has had its own place in the DSLR market. The tilt screen is the feature I miss most having switched away from Sony to Canon in the past. I might not need it often, but when I do need it, I need it and have missed shots from not having it... additional to that, Canon better improve the LV contrast AF speed. Look at Olympus' improvements to the E-P1 since launch.
Canon 1D, 300D IR, 450D full spectrum, 600D, 5D2, 7D, 7D2, EF 35/2, 85/1.8, 135/2+SF, 70-300L, 100-400L
EF-S 10-18, 15-85, MP-E 65, Zeiss 50/2 macro, Sigma 50A, 150 macro, 120-300/2.8 OS, Samyang 8mm fisheye