@Ophiuchus, check out Geoff's comment on that commit.
What else can be done? (not for patchy playtesting but for future integration into master). I guess the obvious and disagreeable alternative is to have one bay part for each fighter type (would add up to 4 parts in total, currently we have four parts plus two unused), with the annoying drawback of breaking ship design compatibility (although ship design files could easily "repaired" via a script).