Khalid
Warlord
Survey: This seems tempting but greedy, and I'm going to be running it from Code of Laws to whatever civic I get next, at least in my first couple games. I'm going to be starting double scout, and I'd love to give them both a big XP boost early on – and though we can expect fiercer barbs than in Civ 5, we'll see if they come out swinging or if they become more of a threat after the first 15 or so turns have passed.
I like survey as well. Especially with Rome (with the monument you get Code of Laws on t7), or in situations where you clear the nearest barb camp with your warrior, which looks easy even without Discipline. Then Survey is viable until the second civic is researched.