You are on the right track! You MUST recreate the OEM wiper wiring if you plan to use an OEM wiper switch and an OEM wiper motor.
You need a 6 pin FEMALE connector on the wiper switch side and a 4 pin FEMALE connector on the wiper motor side.
You need a 4 wire harness to go between the OEM wiper switch and the wiper motor. You will need Blue, Blue/Black, Blue/Red and Blue/White 16ga wires.
Connect as shown on the drawing below and you will be fine. Note the crossed LW and LB wires are NOT wrong!
View attachment 1948722
I sell the wire and connectors with terminals if you need them. Just need to know how long you need the wires.