Umm ...no. Gaither isn't coming back here. Compared to Gaither, McKinnie has a stellar work ethic.
As to Clabo, Winston and Smith, I think those guys are RT's, and I personally don't wanna see Oher on the left side anymore.
Like others have said, no rush to re-sign McKinnie because there's plenty of time. His price may drop, or other options may present themselves.