Need help on picking new wiring..

Try Ron Francis. Eliminates bulkhead connectors.