Well I think I got it. I had an order into Mouser and figured what the heck and added on a few of each of the OCS 1.5 and 2.8 terminals in stock to see if they worked. It was worth the $5 dollar gamble...
If anyone wants to do the wiring themselves and save a few bucks over buying a pre-terminated block for any upfitters switches and power this is what you need:
For the physical connector that plugs into the X7 socket on the junction block you'll need: Aptiv 15547106
The connector is the right design, but it is physically keyed differently. The correctly keyed connector is out of stock everywhere, but with a razor blade you can cut off the second key that prevents it from fitting.
Here the connector is before I cut it:
Here the connector is after I cut it:
Here is the cavity in the junction box:
As far as the terminals I found 3 that will work.
For cavities 2,3,5,6,8,912,13,15,16,18,19 use Aptiv 33385008 - this is for all the smaller cavities, so that terminal is only good for 20-16 AWG probably.
For cavities 1,4,7,10,11,14,17,20 use Aptiv 35063087 or Aptiv 35063083 depending on your wire gauge. Both fit the larger cavities.
All these parts are in stock at Mouser and you can order them in quantities of 1 or more, so no bulk ordering required. For under $10 bucks you can make your own connector, have a much cleaner look and save a few bucks.