Use the stock harness. Cut off the wedge bulb pigtail. Take the back of the 99 housing and use xacto knife to open up the back so that the stock socket can drop in and twist lock.
Done 2 filament.
The Z1 / CZP pigtails have been useless since before they got invented.