Wrong tires mandatory / free choice of tires not possible

The tire rules are pretty clear on what teams / cars are required to do.  I don't see a big issue for weekends with sprint qualifiers, but for weekends without a sprint:

1. Each team / car gets 2 sets of hards, 3 sets of mediums, and 8 sets of softs;
2. They have to go into Q3 with a set of softs and into the Sunday race with a set of mediums and a set of hards; and
3. They have to return 6 of the 13 sets by the end of P3.

Put these rules together and that leaves a choice of four tires going into Q1 and available for Sunday which are up to the team / car.  If a team wants to go into qualifying / race with 3 sets of mediums, 2 sets of hards and 2 sets of softs then that's their prerogative, sub-optimal, but still their prerogative.  

It looks to me like Codies is operating under the mistaken impression that only softs may be used in qualifying and that this means teams must take all softs as their four option sets.  This just isn't the case.   

I believe an adequate fix to this would be to give the player the option of moving a set of hards or a set of mediums into the 'suggested for Q1' in exchange for returning a set of softs after P3, or at the very least an option of taking an extra set of mediums into the weekends (the better 2 stop strategy is often soft-medium-medium, I don't think running 2 sets of hards ever makes sense in the game).