ADAguy, you're in California, right? To clarify: it is not the CBC that specifies the quantity and type of fixtures based on gender - - that is determined by the Plumbing Code.
Also, remember that up until recently in CA, single-user could be specified by gender. Now, single user toilet rooms must be gender-neutral (aka "unisex" or "family").
The CBC does describe how multi-user facilities and single-user facilities relate to each other in 11B-213.2. In general, the default is that EACH [that is, all] of the toilet rooms must be accessible. The exceptions are:
1. Where it is infeasible to modify existing multi-user toilet rooms (MUTR), then one additional single-user toilet room (SUTR) can substitute for the two MUTRs. This exception does not appear to be available for new construction.
2. Reserved.
3. 5% of multiple clustered portable SUTRs must be accessible
4. 50% of multiple clustered (permanent) SUTRs must be accessible
In the diagram you've shown above, it appears to me that the accessible stall + sinks are within, not separate from, the other restrooms.
So, I think your diagram DOES meet code, especially if the toilet partitions are not creating fully separated rooms.