Well, I'm thinking about it in terms of the individual lamps, since they aren't shaped left or right.
What I mean is, on the Squadron and S2 series, you've essentially got 2 lens patterns and 2 intensities, (3 if you include the racers since they're oddballs). There's a 42°, a 9°, and a 4°, and when you're picking lights, you're really just making different combinations of those, and in whichever intensity you want to pay for.
So, for example, with the lights I listed, I've got six wide angle lamps at 42°, and six spot lamps (two 9° lamps and four 4° lamps). That's not including the fogs of course.
I can see an argument though that I need more lumens dedicated to spots, since I'm throwing that light further, so an alternative combo would be four 42°, four 9° and four 4°. That would be two S2 cornering, a Squadron Spot and a Squadron Racer. Again, ignoring the fogs. Maybe that's better.
Does that all make sense?
Still I'm undecided on the fogs - I just checked out some videos showing the S2 sports and while they have a bit of a cutoff it's not exactly sharp.