In that case I'd go for the 7D. You are professional minded and you will want this camera to hold you through your refresher time into professional level work. The 60D will do that, but the 7D is a bit more robust, better build, better focus system, etc.
Are you saying that with the sale you'll have £2000? I'd buy the 7D with the 24-70 f/2.8 and the 580EX II Speedlite.