I think that you may be correct here, Rricwb. In the first wave, the Akagi launched 12 B5N2 “Kate” torpedo bombers carrying torpedos with fins modified to run in the relatively shallow waters of Peal Harbor and 15 “Kates" armed with 800-kg Type 99 model 5 bombs. If you look closely at Pruel's incredible scene, you may just sight Lt. Cmdr. Mitsuo Fuchida standing in the cockpit of one of those Kates.
The Kates were tasked with attacking 'Battleship Row' and the nine A6M2 "Zeke" fighters launched from Akagi provided air cover before being directed to attack Hickham air field. From what I recall, the scouts launched in the first wave stayed close to the Akagi's battle group to provide security. But, my recollection may be off because of the obscene hour at which I make this post.
There are a number of photographs published to the web which were taken on the flight deck of the Akagi on the morning of December 7 which may also be of use to you. Just remember that if they include "Val" dive bombers, the photo is of the second wave.