Cid actually is still an airship engineer in FFVI. He's the one who fixed the Blackjack when it crashed after you visit the Esper Cave. There's an often-missed scene where Cid is telling Setzer that he'll fix the airship for him.

Or something like that.