Why not rent a camera? 700D, 70D, 7D2, SL1 are all in the "coming soon" category and I am guessing you don't want to buy in a hurry and regret later. I would have said 5D3 or 6D but since your criteria is the budget of $2000, and you came from a 20D background I guess you are hoping for a 70D or a 7D2. Mind you, a 60D or a 7D are still great cameras.
Take a look at 6D with the 24-105 kit lens. FF is another dimension. I went from 300D to the 5D3 and am delighted to say the least.