The problem is that you're trying to give the Intrepid a level of organization that it simply never head. It's beyond even something like the Tiger's Claw that was simply so engaged that the reality of losses never matched up with its official complement -- there's just no official complement to start with. It's a mishmash of militia units, abandoned obsolete fighters and bits and pieces collected wherever possible.
That said, you're undershooting significantly -- when Blair arrives on the Intrepid, she has 57 fighters (31 operational front line, 9 damaged, 17 obsolete in storage). She has four squadrons, one bomber and three fighter, but it's never more specific than that -- the bomber group includes Avengers, Thunderbolts, Broadswords, Sabres... and any one of the fighter squadrons includes half a dozen different classes.
