Between these options, Iwould optimize for space and future maintenance. In my case, I'm nearing 86 packs. Some are 130p and some are 102p because some are 1900mah cells and some are 2600mah cells... different purchases over 3 years. In my opinion - its hard to say "I'm going 80p exactly" as you don't know what deals on cells you may find over time.
I settled on 260ah (+/- 2%) per pack for my physical design. So I need 260,000/1900 = 136cells for some packs and 260,000/2600 = 100cells for others. On the 100cell packs, I just have empty slots in the base 4x5 cell holder design- but overall, the packs are interchangeable as far as capacity and physical deign. So you can finalize the shelving or cabinet and still have flexibility for future packs / battery purchases.
I understand that you don't want to mix packs of different cell types in series - but this gives flexibility to distribute the different cell types evenly parallel wise and I do with good success.