I vote for Cid. Though I think Vincent would be the natural replacement with his higher magic stat and being otherwise useless.

Also I was amused at your fear of Wutai. Avoiding the Yuffie sidequest?