Run away from Painless as they put all their $$ into marketing and little into product development.
You are between a rock and a wall in that you have enough changes that make a stock harness all but useless, but the changes you do have do not lend themselves to the available upgrade harnesses. I'll agree the update series is overkill for your needs
My suggestion would be to talk to American Autowire, explain the situation, and see if they would supply you with the connectors and terminals you would need (at additional cost) if you bought one of their hi-hway series kits.
This would get you everything you need to make your own custom harness.
The other option would be to buy one of the kits like the hi way series, reuse your switch connectors and source the terminals which are available. You will need to be able to understand the factory schematics and how to correctly wire in the changes.
I do have an extra set/pair of the Packard crimpers you would need if you go that way. PM me if interested.
I have used AA almost exclusively for the last 20 + years in a multitude of customers cars.
The last option would be to spring for the AA upgrade kit which is $$and overkill.
I have always preferred the hi way kits in a situation like this as you can route the harness as you want and terminate BOTH ends cleanly without a bunch of leftover cr-p you don't want or need
Francis has been around for quite some time, the speedway kit ?, Painless