Again, off of the top of my head I'll say;
Riker: EaF to AGT except;
Data: Gambit (also Peak Performance during the battle simulation)
Appointed Number One
How'd I do?
Pretty sure you're right. Although Data was also promoted during Chain Of Command