What I'm thinking about after seeing what you've done is having a variant of the standard PF that carries a PF. That way a Tender can carry a 4+2 package, their Leader, their special and the 2 standard variants that themselves have 2 for a total of 6. That puts them a bit more on par with their ftr carrier cousins. Since we are classing Tenders with 4 very stripped PF's as carriers, they ought be carriers in that sense of the word...
I wonder what would happen if we added 2 columns to the shiplist and had 6 ftr bays...