What body are you shooting with?
I just sent my 24-70 2.8 back to Nikon. It also had focusing issues.
are you going to get another Tokina, or go with a Sigma instead?
I am torn between a few lenses in that range myself, but am considering a macro lens, which can hopefull double as a good portrait lens.