the round ones are the same on standard harnesses so shouldn't be hard to find.
For the flat inline on the small board... If you're willing to solder 3 wires to the board you can use a simple trailer hitch connector for service disconnect. This is better than having that connector / easily broken pin so close to the top of that board anyway.
If nothing other than OEM proper suits you, the Dart panels where a long sweep speedometer is will have 2 of the same inline connectors.