Concur.
Tony's a horrible "field agent." Remember in season 3, he got shot on a routine assignment. He's the "anti-Jack." He's much better as a point man.