I wanted to say your post has been super helpful.
I'm going to do the same for my Liebert GXT3 fans.
I ordered pre-terminated connectors with leads too and I was wondering about the other pat of the cable, the one you labeled "Matching connection".
Would a 4-pin extension from Noctua be OK...